-#![feature(rustc_private, decl_macro, type_alias_impl_trait, associated_type_bounds, never_type)]
-#![allow(intra_doc_link_resolution_failure)]
+#![feature(
+ rustc_private,
+ decl_macro,
+ type_alias_impl_trait,
+ associated_type_bounds,
+ never_type,
+ try_blocks,
+ hash_drain_filter,
+ str_split_once
+)]
#![warn(rust_2018_idioms)]
#![warn(unused_lifetimes)]
+#![warn(unreachable_pub)]
-extern crate flate2;
#[cfg(feature = "jit")]
extern crate libc;
+extern crate snap;
+#[macro_use]
extern crate rustc_middle;
+extern crate rustc_ast;
extern crate rustc_codegen_ssa;
extern crate rustc_data_structures;
extern crate rustc_errors;
extern crate rustc_hir;
extern crate rustc_incremental;
extern crate rustc_index;
-extern crate rustc_mir;
extern crate rustc_session;
extern crate rustc_span;
-extern crate rustc_symbol_mangling;
extern crate rustc_target;
-extern crate rustc_ast;
// This prevents duplicating functions and statics that are already part of the host rustc process.
#[allow(unused_extern_crates)]
extern crate rustc_driver;
use std::any::Any;
+use std::str::FromStr;
+use rustc_codegen_ssa::traits::CodegenBackend;
+use rustc_codegen_ssa::CodegenResults;
use rustc_errors::ErrorReported;
-use rustc_middle::dep_graph::{DepGraph, WorkProduct, WorkProductId};
+use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoader};
-use rustc_session::Session;
-use rustc_session::config::OutputFilenames;
use rustc_middle::ty::query::Providers;
-use rustc_codegen_ssa::CodegenResults;
-use rustc_codegen_ssa::traits::CodegenBackend;
+use rustc_session::config::OutputFilenames;
+use rustc_session::Session;
use cranelift_codegen::settings::{self, Configurable};
mod analyze;
mod archive;
mod atomic_shim;
-mod base;
mod backend;
+mod base;
mod cast;
mod codegen_i128;
mod common;
mod debuginfo;
mod discriminant;
mod driver;
+mod inline_asm;
mod intrinsics;
mod linkage;
mod main_shim;
mod optimize;
mod pointer;
mod pretty_clif;
-mod target_features_whitelist;
mod toolchain;
mod trap;
mod unsize;
mod prelude {
pub(crate) use std::convert::{TryFrom, TryInto};
- pub(crate) use rustc_ast::ast::{FloatTy, IntTy, UintTy};
pub(crate) use rustc_span::Span;
- pub(crate) use rustc_middle::bug;
pub(crate) use rustc_hir::def_id::{DefId, LOCAL_CRATE};
+ pub(crate) use rustc_middle::bug;
pub(crate) use rustc_middle::mir::{self, *};
pub(crate) use rustc_middle::ty::layout::{self, TyAndLayout};
- pub(crate) use rustc_target::abi::{Abi, LayoutOf, Scalar, Size, VariantIdx};
pub(crate) use rustc_middle::ty::{
- self, FnSig, Instance, InstanceDef, ParamEnv, Ty, TyCtxt, TypeAndMut, TypeFoldable,
+ self, FloatTy, Instance, InstanceDef, IntTy, ParamEnv, Ty, TyCtxt, TypeAndMut,
+ TypeFoldable, UintTy,
};
+ pub(crate) use rustc_target::abi::{Abi, LayoutOf, Scalar, Size, VariantIdx};
pub(crate) use rustc_data_structures::fx::FxHashMap;
pub(crate) use rustc_index::vec::Idx;
- pub(crate) use cranelift_codegen::Context;
pub(crate) use cranelift_codegen::entity::EntitySet;
- pub(crate) use cranelift_codegen::ir::{AbiParam, Block, ExternalName, FuncRef, Inst, InstBuilder, MemFlags, Signature, SourceLoc, StackSlot, StackSlotData, StackSlotKind, TrapCode, Type, Value};
pub(crate) use cranelift_codegen::ir::condcodes::{FloatCC, IntCC};
pub(crate) use cranelift_codegen::ir::function::Function;
pub(crate) use cranelift_codegen::ir::types;
+ pub(crate) use cranelift_codegen::ir::{
+ AbiParam, Block, ExternalName, FuncRef, Inst, InstBuilder, MemFlags, Signature, SourceLoc,
+ StackSlot, StackSlotData, StackSlotKind, TrapCode, Type, Value,
+ };
pub(crate) use cranelift_codegen::isa::{self, CallConv};
+ pub(crate) use cranelift_codegen::Context;
pub(crate) use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext, Variable};
- pub(crate) use cranelift_module::{
- self, Backend, DataContext, DataId, FuncId, Linkage, Module,
- };
+ pub(crate) use cranelift_module::{self, DataContext, DataId, FuncId, Linkage, Module};
pub(crate) use crate::abi::*;
- pub(crate) use crate::base::{trans_operand, trans_place};
+ pub(crate) use crate::base::{codegen_operand, codegen_place};
pub(crate) use crate::cast::*;
pub(crate) use crate::common::*;
pub(crate) use crate::debuginfo::{DebugContext, UnwindContext};
}
}
-struct CodegenCx<'tcx, B: Backend + 'static> {
+struct CodegenCx<'tcx, M: Module> {
tcx: TyCtxt<'tcx>,
- module: Module<B>,
+ module: M,
+ global_asm: String,
constants_cx: ConstantCx,
cached_context: Context,
vtables: FxHashMap<(Ty<'tcx>, Option<ty::PolyExistentialTraitRef<'tcx>>), DataId>,
unwind_context: UnwindContext<'tcx>,
}
-impl<'tcx, B: Backend + 'static> CodegenCx<'tcx, B> {
- fn new(
- tcx: TyCtxt<'tcx>,
- module: Module<B>,
- debug_info: bool,
- ) -> Self {
- let unwind_context = UnwindContext::new(tcx, module.isa());
+impl<'tcx, M: Module> CodegenCx<'tcx, M> {
+ fn new(tcx: TyCtxt<'tcx>, module: M, debug_info: bool, pic_eh_frame: bool) -> Self {
+ let unwind_context = UnwindContext::new(tcx, module.isa(), pic_eh_frame);
let debug_context = if debug_info {
- Some(DebugContext::new(
- tcx,
- module.isa(),
- ))
+ Some(DebugContext::new(tcx, module.isa()))
} else {
None
};
CodegenCx {
tcx,
module,
+ global_asm: String::new(),
constants_cx: ConstantCx::default(),
cached_context: Context::new(),
vtables: FxHashMap::default(),
}
}
- fn finalize(mut self) -> (Module<B>, Option<DebugContext<'tcx>>, UnwindContext<'tcx>) {
+ fn finalize(mut self) -> (M, String, Option<DebugContext<'tcx>>, UnwindContext<'tcx>) {
self.constants_cx.finalize(self.tcx, &mut self.module);
- (self.module, self.debug_context, self.unwind_context)
+ (
+ self.module,
+ self.global_asm,
+ self.debug_context,
+ self.unwind_context,
+ )
+ }
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum CodegenMode {
+ Aot,
+ Jit,
+ JitLazy,
+}
+
+impl Default for CodegenMode {
+ fn default() -> Self {
+ CodegenMode::Aot
+ }
+}
+
+impl FromStr for CodegenMode {
+ type Err = String;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ match s {
+ "aot" => Ok(CodegenMode::Aot),
+ "jit" => Ok(CodegenMode::Jit),
+ "jit-lazy" => Ok(CodegenMode::JitLazy),
+ _ => Err(format!("Unknown codegen mode `{}`", s)),
+ }
+ }
+}
+
+#[derive(Copy, Clone, Debug, Default)]
+pub struct BackendConfig {
+ pub codegen_mode: CodegenMode,
+}
+
+impl BackendConfig {
+ fn from_opts(opts: &[String]) -> Result<Self, String> {
+ let mut config = BackendConfig::default();
+ for opt in opts {
+ if let Some((name, value)) = opt.split_once('=') {
+ match name {
+ "mode" => config.codegen_mode = value.parse()?,
+ _ => return Err(format!("Unknown option `{}`", name)),
+ }
+ } else {
+ return Err(format!("Invalid option `{}`", opt));
+ }
+ }
+ Ok(config)
}
}
-struct CraneliftCodegenBackend;
+pub struct CraneliftCodegenBackend {
+ pub config: Option<BackendConfig>,
+}
impl CodegenBackend for CraneliftCodegenBackend {
fn init(&self, sess: &Session) {
Box::new(crate::metadata::CraneliftMetadataLoader)
}
- fn provide(&self, providers: &mut Providers<'_>) {
- providers.target_features_whitelist = |tcx, cnum| {
- assert_eq!(cnum, LOCAL_CRATE);
- if tcx.sess.opts.actually_rustdoc {
- // rustdoc needs to be able to document functions that use all the features, so
- // whitelist them all
- target_features_whitelist::all_known_features()
- .chain(Some(("cg_clif", None)))
- .map(|(a, b)| (a.to_string(), b))
- .collect()
- } else {
- target_features_whitelist::target_feature_whitelist(tcx.sess)
- .iter()
- .chain(&Some(("cg_clif", None)))
- .map(|&(a, b)| (a.to_string(), b))
- .collect()
- }
- };
- }
- fn provide_extern(&self, _providers: &mut Providers<'_>) {}
+ fn provide(&self, _providers: &mut Providers) {}
+ fn provide_extern(&self, _providers: &mut Providers) {}
fn target_features(&self, _sess: &Session) -> Vec<rustc_span::Symbol> {
- vec![rustc_span::Symbol::intern("cg_clif")]
+ vec![]
}
fn codegen_crate<'tcx>(
metadata: EncodedMetadata,
need_metadata_module: bool,
) -> Box<dyn Any> {
- let res = driver::codegen_crate(tcx, metadata, need_metadata_module);
-
- rustc_symbol_mangling::test::report_symbol_names(tcx);
+ let config = if let Some(config) = self.config {
+ config
+ } else {
+ BackendConfig::from_opts(&tcx.sess.opts.cg.llvm_args)
+ .unwrap_or_else(|err| tcx.sess.fatal(&err))
+ };
+ let res = driver::codegen_crate(tcx, metadata, need_metadata_module, config);
res
}
fn join_codegen(
&self,
ongoing_codegen: Box<dyn Any>,
- sess: &Session,
- dep_graph: &DepGraph,
- ) -> Result<Box<dyn Any>, ErrorReported> {
- let (codegen_results, work_products) = *ongoing_codegen.downcast::<(CodegenResults, FxHashMap<WorkProductId, WorkProduct>)>().unwrap();
-
- sess.time("serialize_work_products", move || {
- rustc_incremental::save_work_product_index(sess, &dep_graph, work_products)
- });
-
- Ok(Box::new(codegen_results))
+ _sess: &Session,
+ ) -> Result<(CodegenResults, FxHashMap<WorkProductId, WorkProduct>), ErrorReported> {
+ Ok(*ongoing_codegen
+ .downcast::<(CodegenResults, FxHashMap<WorkProductId, WorkProduct>)>()
+ .unwrap())
}
fn link(
&self,
sess: &Session,
- res: Box<dyn Any>,
+ codegen_results: CodegenResults,
outputs: &OutputFilenames,
) -> Result<(), ErrorReported> {
use rustc_codegen_ssa::back::link::link_binary;
- sess.abort_if_errors();
-
- let codegen_results = *res
- .downcast::<CodegenResults>()
- .expect("Expected CraneliftCodegenBackend's CodegenResult, found Box<Any>");
-
- let _timer = sess.prof.generic_activity("link_crate");
-
- sess.time("linking", || {
- let target_cpu = crate::target_triple(sess).to_string();
- link_binary::<crate::archive::ArArchiveBuilder<'_>>(
- sess,
- &codegen_results,
- outputs,
- &codegen_results.crate_name.as_str(),
- &target_cpu,
- );
- });
-
- rustc_incremental::finalize_session_directory(sess, codegen_results.crate_hash);
+ let target_cpu = crate::target_triple(sess).to_string();
+ link_binary::<crate::archive::ArArchiveBuilder<'_>>(
+ sess,
+ &codegen_results,
+ outputs,
+ &codegen_results.crate_name.as_str(),
+ &target_cpu,
+ );
Ok(())
}
}
fn target_triple(sess: &Session) -> target_lexicon::Triple {
- sess.target.target.llvm_target.parse().unwrap()
+ sess.target.llvm_target.parse().unwrap()
}
-fn build_isa(sess: &Session, enable_pic: bool) -> Box<dyn isa::TargetIsa + 'static> {
+fn build_isa(sess: &Session) -> Box<dyn isa::TargetIsa + 'static> {
use target_lexicon::BinaryFormat;
let target_triple = crate::target_triple(sess);
let mut flags_builder = settings::builder();
- if enable_pic {
- flags_builder.enable("is_pic").unwrap();
- } else {
- flags_builder.set("is_pic", "false").unwrap();
- }
+ flags_builder.enable("is_pic").unwrap();
flags_builder.set("enable_probestack", "false").unwrap(); // __cranelift_probestack is not provided
flags_builder
.set(
};
flags_builder.set("tls_model", tls_model).unwrap();
- // FIXME(CraneStation/cranelift#732) fix LICM in presence of jump tables
- /*
+ flags_builder.set("enable_simd", "true").unwrap();
+
use rustc_session::config::OptLevel;
match sess.opts.optimize {
OptLevel::No => {
OptLevel::Size | OptLevel::SizeMin => {
sess.warn("Optimizing for size is not supported. Just ignoring the request");
}
- }*/
+ }
let flags = settings::Flags::new(flags_builder);
- cranelift_codegen::isa::lookup(target_triple)
- .unwrap()
- .finish(flags)
+
+ let variant = if cfg!(feature = "oldbe") {
+ cranelift_codegen::isa::BackendVariant::Legacy
+ } else {
+ cranelift_codegen::isa::BackendVariant::MachInst
+ };
+ let mut isa_builder = cranelift_codegen::isa::lookup_variant(target_triple, variant).unwrap();
+ // Don't use "haswell", as it implies `has_lzcnt`.macOS CI is still at Ivy Bridge EP, so `lzcnt`
+ // is interpreted as `bsr`.
+ isa_builder.enable("nehalem").unwrap();
+ isa_builder.finish(flags)
}
/// This is the entrypoint for a hot plugged rustc_codegen_cranelift
#[no_mangle]
pub fn __rustc_codegen_backend() -> Box<dyn CodegenBackend> {
- Box::new(CraneliftCodegenBackend)
+ Box::new(CraneliftCodegenBackend { config: None })
}
projects / rust.git / blobdiff