Skip to content

Commit 7f22750

Browse files
JonathanBrouwerJonathanBrouwer
authored
Rollup merge of rust-lang#153184 - bjorn3:split_crate_info_out_of_codegen_results, r=nnethercote
Replace CodegenResults with CompiledModules This is already CodegenResults without CrateInfo. The driver can calculate the CrateInfo and pass it by-ref to the backend. Using CompiledModules makes it a bit easier to move some other things out of the backend as will be necessary for moving LTO to the link phase. Helps with rust-lang/compiler-team#908
2 parents f4af27b + 5aa980e commit 7f22750

17 files changed

Lines changed: 293 additions & 304 deletions

File tree

‎compiler/rustc_codegen_cranelift/src/driver/aot.rs‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ use std::thread::JoinHandle;
1010

1111
use cranelift_object::{ObjectBuilder, ObjectModule};
1212
use rustc_codegen_ssa::assert_module_sources::CguReuse;
13-
use rustc_codegen_ssa::back::write::{CompiledModules, produce_final_output_artifacts};
13+
use rustc_codegen_ssa::back::write::produce_final_output_artifacts;
1414
use rustc_codegen_ssa::base::determine_cgu_reuse;
15-
use rustc_codegen_ssa::{CodegenResults, CompiledModule, CrateInfo, ModuleKind};
15+
use rustc_codegen_ssa::{CompiledModule, CompiledModules, ModuleKind};
1616
use rustc_data_structures::profiling::SelfProfilerRef;
1717
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
1818
use rustc_data_structures::sync::{IntoDynSyncSend, par_map};
@@ -54,7 +54,6 @@ impl<HCX> HashStable<HCX> for OngoingModuleCodegen {
5454
pub(crate) struct OngoingCodegen {
5555
modules: Vec<OngoingModuleCodegen>,
5656
allocator_module: Option<CompiledModule>,
57-
crate_info: CrateInfo,
5857
concurrency_limiter: ConcurrencyLimiter,
5958
}
6059

@@ -63,7 +62,7 @@ impl OngoingCodegen {
6362
self,
6463
sess: &Session,
6564
outputs: &OutputFilenames,
66-
) -> (CodegenResults, FxIndexMap<WorkProductId, WorkProduct>) {
65+
) -> (CompiledModules, FxIndexMap<WorkProductId, WorkProduct>) {
6766
let mut work_products = FxIndexMap::default();
6867
let mut modules = vec![];
6968
let disable_incr_cache = disable_incr_cache();
@@ -126,15 +125,7 @@ impl OngoingCodegen {
126125

127126
produce_final_output_artifacts(sess, &compiled_modules, outputs);
128127

129-
(
130-
CodegenResults {
131-
crate_info: self.crate_info,
132-
133-
modules: compiled_modules.modules,
134-
allocator_module: compiled_modules.allocator_module,
135-
},
136-
work_products,
137-
)
128+
(compiled_modules, work_products)
138129
}
139130
}
140131

@@ -483,13 +474,6 @@ fn emit_allocator_module(tcx: TyCtxt<'_>) -> Option<CompiledModule> {
483474
}
484475

485476
pub(crate) fn run_aot(tcx: TyCtxt<'_>) -> Box<OngoingCodegen> {
486-
// FIXME handle `-Ctarget-cpu=native`
487-
let target_cpu = match tcx.sess.opts.cg.target_cpu {
488-
Some(ref name) => name,
489-
None => tcx.sess.target.cpu.as_ref(),
490-
}
491-
.to_owned();
492-
493477
let cgus = tcx.collect_and_partition_mono_items(()).codegen_units;
494478

495479
if tcx.dep_graph.is_fully_enabled() {
@@ -549,7 +533,6 @@ pub(crate) fn run_aot(tcx: TyCtxt<'_>) -> Box<OngoingCodegen> {
549533
Box::new(OngoingCodegen {
550534
modules,
551535
allocator_module,
552-
crate_info: CrateInfo::new(tcx, target_cpu),
553536
concurrency_limiter: concurrency_limiter.0,
554537
})
555538
}

‎compiler/rustc_codegen_cranelift/src/driver/jit.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ use crate::debuginfo::TypeDebugContext;
1616
use crate::prelude::*;
1717
use crate::unwind_module::UnwindModule;
1818

19-
fn create_jit_module(tcx: TyCtxt<'_>) -> (UnwindModule<JITModule>, Option<DebugContext>) {
20-
let crate_info = CrateInfo::new(tcx, "dummy_target_cpu".to_string());
21-
19+
fn create_jit_module(
20+
tcx: TyCtxt<'_>,
21+
crate_info: &CrateInfo,
22+
) -> (UnwindModule<JITModule>, Option<DebugContext>) {
2223
let isa = crate::build_isa(tcx.sess, true);
2324
let mut jit_builder = JITBuilder::with_isa(isa, cranelift_module::default_libcall_names());
2425
crate::compiler_builtins::register_functions_for_jit(&mut jit_builder);
25-
jit_builder.symbol_lookup_fn(dep_symbol_lookup_fn(tcx.sess, crate_info));
26+
jit_builder.symbol_lookup_fn(dep_symbol_lookup_fn(tcx.sess, crate_info.clone()));
2627
let mut jit_module = UnwindModule::new(JITModule::new(jit_builder), false);
2728

2829
let cx = DebugContext::new(tcx, jit_module.isa(), false, "dummy_cgu_name");
@@ -32,14 +33,14 @@ fn create_jit_module(tcx: TyCtxt<'_>) -> (UnwindModule<JITModule>, Option<DebugC
3233
(jit_module, cx)
3334
}
3435

35-
pub(crate) fn run_jit(tcx: TyCtxt<'_>, jit_args: Vec<String>) -> ! {
36+
pub(crate) fn run_jit(tcx: TyCtxt<'_>, crate_info: &CrateInfo, jit_args: Vec<String>) -> ! {
3637
if !tcx.crate_types().contains(&rustc_session::config::CrateType::Executable) {
3738
tcx.dcx().fatal("can't jit non-executable crate");
3839
}
3940

4041
let output_filenames = tcx.output_filenames(());
4142
let should_write_ir = crate::pretty_clif::should_write_ir(tcx.sess);
42-
let (mut jit_module, mut debug_context) = create_jit_module(tcx);
43+
let (mut jit_module, mut debug_context) = create_jit_module(tcx, crate_info);
4344
let mut cached_context = Context::new();
4445

4546
let cgus = tcx.collect_and_partition_mono_items(()).codegen_units;

‎compiler/rustc_codegen_cranelift/src/lib.rs‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use std::sync::Arc;
4040
use cranelift_codegen::isa::TargetIsa;
4141
use cranelift_codegen::settings::{self, Configurable};
4242
use rustc_codegen_ssa::traits::CodegenBackend;
43-
use rustc_codegen_ssa::{CodegenResults, TargetConfig};
43+
use rustc_codegen_ssa::{CompiledModules, CrateInfo, TargetConfig};
4444
use rustc_log::tracing::info;
4545
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
4646
use rustc_session::Session;
@@ -200,12 +200,21 @@ impl CodegenBackend for CraneliftCodegenBackend {
200200
println!("Cranelift version: {}", cranelift_codegen::VERSION);
201201
}
202202

203-
fn codegen_crate(&self, tcx: TyCtxt<'_>) -> Box<dyn Any> {
203+
fn target_cpu(&self, sess: &Session) -> String {
204+
// FIXME handle `-Ctarget-cpu=native`
205+
match sess.opts.cg.target_cpu {
206+
Some(ref name) => name,
207+
None => sess.target.cpu.as_ref(),
208+
}
209+
.to_owned()
210+
}
211+
212+
fn codegen_crate(&self, tcx: TyCtxt<'_>, _crate_info: &CrateInfo) -> Box<dyn Any> {
204213
info!("codegen crate {}", tcx.crate_name(LOCAL_CRATE));
205214
let config = self.config.get().unwrap();
206215
if config.jit_mode {
207216
#[cfg(feature = "jit")]
208-
driver::jit::run_jit(tcx, config.jit_args.clone());
217+
driver::jit::run_jit(tcx, _crate_info, config.jit_args.clone());
209218

210219
#[cfg(not(feature = "jit"))]
211220
tcx.dcx().fatal("jit support was disabled when compiling rustc_codegen_cranelift");
@@ -219,7 +228,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
219228
ongoing_codegen: Box<dyn Any>,
220229
sess: &Session,
221230
outputs: &OutputFilenames,
222-
) -> (CodegenResults, FxIndexMap<WorkProductId, WorkProduct>) {
231+
) -> (CompiledModules, FxIndexMap<WorkProductId, WorkProduct>) {
223232
ongoing_codegen.downcast::<driver::aot::OngoingCodegen>().unwrap().join(sess, outputs)
224233
}
225234
}

‎compiler/rustc_codegen_gcc/src/lib.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ use rustc_codegen_ssa::back::write::{
8888
use rustc_codegen_ssa::base::codegen_crate;
8989
use rustc_codegen_ssa::target_features::cfg_target_feature;
9090
use rustc_codegen_ssa::traits::{CodegenBackend, ExtraBackendMethods, WriteBackendMethods};
91-
use rustc_codegen_ssa::{CodegenResults, CompiledModule, ModuleCodegen, TargetConfig};
91+
use rustc_codegen_ssa::{CompiledModule, CompiledModules, CrateInfo, ModuleCodegen, TargetConfig};
9292
use rustc_data_structures::fx::FxIndexMap;
9393
use rustc_data_structures::profiling::SelfProfilerRef;
9494
use rustc_data_structures::sync::IntoDynSyncSend;
@@ -287,19 +287,20 @@ impl CodegenBackend for GccCodegenBackend {
287287
|tcx, ()| gcc_util::global_gcc_features(tcx.sess)
288288
}
289289

290-
fn codegen_crate(&self, tcx: TyCtxt<'_>) -> Box<dyn Any> {
291-
let target_cpu = target_cpu(tcx.sess);
292-
let res = codegen_crate(self.clone(), tcx, target_cpu.to_string());
290+
fn target_cpu(&self, sess: &Session) -> String {
291+
target_cpu(sess).to_owned()
292+
}
293293

294-
Box::new(res)
294+
fn codegen_crate(&self, tcx: TyCtxt<'_>, crate_info: &CrateInfo) -> Box<dyn Any> {
295+
Box::new(codegen_crate(self.clone(), tcx, crate_info))
295296
}
296297

297298
fn join_codegen(
298299
&self,
299300
ongoing_codegen: Box<dyn Any>,
300301
sess: &Session,
301302
_outputs: &OutputFilenames,
302-
) -> (CodegenResults, FxIndexMap<WorkProductId, WorkProduct>) {
303+
) -> (CompiledModules, FxIndexMap<WorkProductId, WorkProduct>) {
303304
ongoing_codegen
304305
.downcast::<rustc_codegen_ssa::back::write::OngoingCodegen<GccCodegenBackend>>()
305306
.expect("Expected GccCodegenBackend's OngoingCodegen, found Box<Any>")

‎compiler/rustc_codegen_llvm/src/lib.rs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use rustc_codegen_ssa::back::write::{
3333
TargetMachineFactoryFn,
3434
};
3535
use rustc_codegen_ssa::traits::*;
36-
use rustc_codegen_ssa::{CodegenResults, CompiledModule, ModuleCodegen, TargetConfig};
36+
use rustc_codegen_ssa::{CompiledModule, CompiledModules, CrateInfo, ModuleCodegen, TargetConfig};
3737
use rustc_data_structures::fx::FxIndexMap;
3838
use rustc_data_structures::profiling::SelfProfilerRef;
3939
use rustc_errors::{DiagCtxt, DiagCtxtHandle};
@@ -360,21 +360,21 @@ impl CodegenBackend for LlvmCodegenBackend {
360360
will_not_use_fallback
361361
}
362362

363-
fn codegen_crate<'tcx>(&self, tcx: TyCtxt<'tcx>) -> Box<dyn Any> {
364-
Box::new(rustc_codegen_ssa::base::codegen_crate(
365-
LlvmCodegenBackend(()),
366-
tcx,
367-
crate::llvm_util::target_cpu(tcx.sess).to_string(),
368-
))
363+
fn target_cpu(&self, sess: &Session) -> String {
364+
crate::llvm_util::target_cpu(sess).to_string()
365+
}
366+
367+
fn codegen_crate<'tcx>(&self, tcx: TyCtxt<'tcx>, crate_info: &CrateInfo) -> Box<dyn Any> {
368+
Box::new(rustc_codegen_ssa::base::codegen_crate(LlvmCodegenBackend(()), tcx, crate_info))
369369
}
370370

371371
fn join_codegen(
372372
&self,
373373
ongoing_codegen: Box<dyn Any>,
374374
sess: &Session,
375375
outputs: &OutputFilenames,
376-
) -> (CodegenResults, FxIndexMap<WorkProductId, WorkProduct>) {
377-
let (codegen_results, work_products) = ongoing_codegen
376+
) -> (CompiledModules, FxIndexMap<WorkProductId, WorkProduct>) {
377+
let (compiled_modules, work_products) = ongoing_codegen
378378
.downcast::<rustc_codegen_ssa::back::write::OngoingCodegen<LlvmCodegenBackend>>()
379379
.expect("Expected LlvmCodegenBackend's OngoingCodegen, found Box<Any>")
380380
.join(sess);
@@ -386,13 +386,14 @@ impl CodegenBackend for LlvmCodegenBackend {
386386
});
387387
}
388388

389-
(codegen_results, work_products)
389+
(compiled_modules, work_products)
390390
}
391391

392392
fn link(
393393
&self,
394394
sess: &Session,
395-
codegen_results: CodegenResults,
395+
compiled_modules: CompiledModules,
396+
crate_info: CrateInfo,
396397
metadata: EncodedMetadata,
397398
outputs: &OutputFilenames,
398399
) {
@@ -405,7 +406,8 @@ impl CodegenBackend for LlvmCodegenBackend {
405406
link_binary(
406407
sess,
407408
&LlvmArchiveBuilderBuilder,
408-
codegen_results,
409+
compiled_modules,
410+
crate_info,
409411
metadata,
410412
outputs,
411413
self.name(),

0 commit comments

Comments
 (0)