Skip to content

Commit 1222f5d

Browse files
borsbors
authored
Auto merge of #34845 - bitshifter:issue-30961, r=alexcrichton
Add help for target CPUs, features, relocation and code models. Fix for #30961. Requires PR rust-lang/llvm#45 to be accepted first, and the .gitmodules for llvm to be updated before this can be merged.
2 parents 0ef24ee + 05045da commit 1222f5d

File tree

12 files changed

+160
-21
lines changed

12 files changed

+160
-21
lines changed

‎mk/rustllvm.mk

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ RUSTLLVM_INCS_$(1) = $$(LLVM_EXTRA_INCDIRS_$(1)) \
3232
$$(call CFG_CC_INCLUDE_$(1),$$(S)src/rustllvm/include)
3333
RUSTLLVM_OBJS_OBJS_$(1) := $$(RUSTLLVM_OBJS_CS_$(1):rustllvm/%.cpp=$(1)/rustllvm/%.o)
3434

35+
# Flag that we are building with Rust's llvm fork
36+
ifeq ($(CFG_LLVM_ROOT),)
37+
RUSTLLVM_CXXFLAGS_$(1) := -DLLVM_RUSTLLVM
38+
endif
39+
3540
# Note that we appease `cl.exe` and its need for some sort of exception
3641
# handling flag with the `EHsc` argument here as well.
3742
ifeq ($$(findstring msvc,$(1)),msvc)
@@ -55,6 +60,7 @@ $(1)/rustllvm/%.o: $(S)src/rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
5560
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@,) \
5661
$$(subst /,//,$$(LLVM_CXXFLAGS_$(1))) \
5762
$$(RUSTLLVM_COMPONENTS_$(1)) \
63+
$$(RUSTLLVM_CXXFLAGS_$(1)) \
5864
$$(EXTRA_RUSTLLVM_CXXFLAGS_$(1)) \
5965
$$(RUSTLLVM_INCS_$(1)) \
6066
$$<

‎src/bootstrap/compile.rs

+4
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@ pub fn rustc<'a>(build: &'a Build, target: &str, compiler: &Compiler<'a>) {
198198
if !build.unstable_features {
199199
cargo.env("CFG_DISABLE_UNSTABLE_FEATURES", "1");
200200
}
201+
// Flag that rust llvm is in use
202+
if build.is_rust_llvm(target) {
203+
cargo.env("LLVM_RUSTLLVM", "1");
204+
}
201205
cargo.env("LLVM_CONFIG", build.llvm_config(target));
202206
if build.config.llvm_static_stdcpp {
203207
cargo.env("LLVM_STATIC_STDCPP",

‎src/bootstrap/lib.rs

+10
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,16 @@ impl Build {
727727
self.out.join(target).join("llvm")
728728
}
729729

730+
/// Returns true if no custom `llvm-config` is set for the specified target.
731+
///
732+
/// If no custom `llvm-config` was specified then Rust's llvm will be used.
733+
fn is_rust_llvm(&self, target: &str) -> bool {
734+
match self.config.target_config.get(target) {
735+
Some(ref c) => c.llvm_config.is_none(),
736+
None => true
737+
}
738+
}
739+
730740
/// Returns the path to `llvm-config` for the specified target.
731741
///
732742
/// If a custom `llvm-config` was specified for target then that's returned

‎src/librustc/session/config.rs

+34-7
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ pub enum PrintRequest {
176176
CrateName,
177177
Cfg,
178178
TargetList,
179+
TargetCPUs,
180+
TargetFeatures,
181+
RelocationModels,
182+
CodeModels,
179183
}
180184

181185
pub enum Input {
@@ -629,9 +633,9 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
629633
lto: bool = (false, parse_bool,
630634
"perform LLVM link-time optimizations"),
631635
target_cpu: Option<String> = (None, parse_opt_string,
632-
"select target processor (llc -mcpu=help for details)"),
636+
"select target processor (rustc --print target-cpus for details)"),
633637
target_feature: String = ("".to_string(), parse_string,
634-
"target specific attributes (llc -mattr=help for details)"),
638+
"target specific attributes (rustc --print target-features for details)"),
635639
passes: Vec<String> = (Vec::new(), parse_list,
636640
"a list of extra LLVM passes to run (space separated)"),
637641
llvm_args: Vec<String> = (Vec::new(), parse_list,
@@ -655,9 +659,9 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
655659
no_redzone: Option<bool> = (None, parse_opt_bool,
656660
"disable the use of the redzone"),
657661
relocation_model: Option<String> = (None, parse_opt_string,
658-
"choose the relocation model to use (llc -relocation-model for details)"),
662+
"choose the relocation model to use (rustc --print relocation-models for details)"),
659663
code_model: Option<String> = (None, parse_opt_string,
660-
"choose the code model to use (llc -code-model for details)"),
664+
"choose the code model to use (rustc --print code-models for details)"),
661665
metadata: Vec<String> = (Vec::new(), parse_list,
662666
"metadata to mangle symbol names with"),
663667
extra_filename: String = ("".to_string(), parse_string,
@@ -1024,7 +1028,8 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
10241028
"[asm|llvm-bc|llvm-ir|obj|link|dep-info]"),
10251029
opt::multi_s("", "print", "Comma separated list of compiler information to \
10261030
print on stdout",
1027-
"[crate-name|file-names|sysroot|cfg|target-list]"),
1031+
"[crate-name|file-names|sysroot|cfg|target-list|target-cpus|\
1032+
target-features|relocation-models|code-models]"),
10281033
opt::flagmulti_s("g", "", "Equivalent to -C debuginfo=2"),
10291034
opt::flagmulti_s("O", "", "Equivalent to -C opt-level=2"),
10301035
opt::opt_s("o", "", "Write output to <filename>", "FILENAME"),
@@ -1238,6 +1243,24 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
12381243
early_error(error_format, "Value for codegen units must be a positive nonzero integer");
12391244
}
12401245

1246+
let mut prints = Vec::<PrintRequest>::new();
1247+
if cg.target_cpu.as_ref().map_or(false, |s| s == "help") {
1248+
prints.push(PrintRequest::TargetCPUs);
1249+
cg.target_cpu = None;
1250+
};
1251+
if cg.target_feature == "help" {
1252+
prints.push(PrintRequest::TargetFeatures);
1253+
cg.target_feature = "".to_string();
1254+
}
1255+
if cg.relocation_model.as_ref().map_or(false, |s| s == "help") {
1256+
prints.push(PrintRequest::RelocationModels);
1257+
cg.relocation_model = None;
1258+
}
1259+
if cg.code_model.as_ref().map_or(false, |s| s == "help") {
1260+
prints.push(PrintRequest::CodeModels);
1261+
cg.code_model = None;
1262+
}
1263+
12411264
let cg = cg;
12421265

12431266
let sysroot_opt = matches.opt_str("sysroot").map(|m| PathBuf::from(&m));
@@ -1315,18 +1338,22 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
13151338
let cfg = parse_cfgspecs(matches.opt_strs("cfg"));
13161339
let test = matches.opt_present("test");
13171340

1318-
let prints = matches.opt_strs("print").into_iter().map(|s| {
1341+
prints.extend(matches.opt_strs("print").into_iter().map(|s| {
13191342
match &*s {
13201343
"crate-name" => PrintRequest::CrateName,
13211344
"file-names" => PrintRequest::FileNames,
13221345
"sysroot" => PrintRequest::Sysroot,
13231346
"cfg" => PrintRequest::Cfg,
13241347
"target-list" => PrintRequest::TargetList,
1348+
"target-cpus" => PrintRequest::TargetCPUs,
1349+
"target-features" => PrintRequest::TargetFeatures,
1350+
"relocation-models" => PrintRequest::RelocationModels,
1351+
"code-models" => PrintRequest::CodeModels,
13251352
req => {
13261353
early_error(error_format, &format!("unknown print request `{}`", req))
13271354
}
13281355
}
1329-
}).collect::<Vec<_>>();
1356+
}));
13301357

13311358
if !cg.remark.is_empty() && debuginfo == NoDebugInfo {
13321359
early_warn(error_format, "-C remark will not show source locations without \

‎src/librustc_driver/lib.rs

+23
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ use pretty::{PpMode, UserIdentifiedItem};
6868
use rustc_resolve as resolve;
6969
use rustc_save_analysis as save;
7070
use rustc_trans::back::link;
71+
use rustc_trans::back::write::{create_target_machine, RELOC_MODEL_ARGS, CODE_GEN_MODEL_ARGS};
7172
use rustc::dep_graph::DepGraph;
7273
use rustc::session::{self, config, Session, build_session, CompileResult};
7374
use rustc::session::config::{Input, PrintRequest, OutputType, ErrorOutputType};
@@ -654,6 +655,28 @@ impl RustcDefaultCalls {
654655
}
655656
}
656657
}
658+
PrintRequest::TargetCPUs => {
659+
let tm = create_target_machine(sess);
660+
unsafe { llvm::LLVMRustPrintTargetCPUs(tm); }
661+
}
662+
PrintRequest::TargetFeatures => {
663+
let tm = create_target_machine(sess);
664+
unsafe { llvm::LLVMRustPrintTargetFeatures(tm); }
665+
}
666+
PrintRequest::RelocationModels => {
667+
println!("Available relocation models:");
668+
for &(name, _) in RELOC_MODEL_ARGS.iter() {
669+
println!(" {}", name);
670+
}
671+
println!("");
672+
}
673+
PrintRequest::CodeModels => {
674+
println!("Available code models:");
675+
for &(name, _) in CODE_GEN_MODEL_ARGS.iter(){
676+
println!(" {}", name);
677+
}
678+
println!("");
679+
}
657680
}
658681
}
659682
return Compilation::Stop;

‎src/librustc_llvm/build.rs

+4
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ fn main() {
112112
cfg.flag(&flag);
113113
}
114114

115+
if env::var_os("LLVM_RUSTLLVM").is_some() {
116+
cfg.flag("-DLLVM_RUSTLLVM");
117+
}
118+
115119
cfg.file("../rustllvm/PassWrapper.cpp")
116120
.file("../rustllvm/RustWrapper.cpp")
117121
.file("../rustllvm/ArchiveWrapper.cpp")

‎src/librustc_llvm/ffi.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1940,6 +1940,9 @@ extern {
19401940
pub fn LLVMRustHasFeature(T: TargetMachineRef,
19411941
s: *const c_char) -> bool;
19421942

1943+
pub fn LLVMRustPrintTargetCPUs(T: TargetMachineRef);
1944+
pub fn LLVMRustPrintTargetFeatures(T: TargetMachineRef);
1945+
19431946
pub fn LLVMRustCreateTargetMachine(Triple: *const c_char,
19441947
CPU: *const c_char,
19451948
Features: *const c_char,

‎src/librustc_trans/back/write.rs

+18-6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,21 @@ use std::sync::mpsc::channel;
3636
use std::thread;
3737
use libc::{c_uint, c_void};
3838

39+
pub const RELOC_MODEL_ARGS : [(&'static str, llvm::RelocMode); 4] = [
40+
("pic", llvm::RelocMode::PIC),
41+
("static", llvm::RelocMode::Static),
42+
("default", llvm::RelocMode::Default),
43+
("dynamic-no-pic", llvm::RelocMode::DynamicNoPic),
44+
];
45+
46+
pub const CODE_GEN_MODEL_ARGS : [(&'static str, llvm::CodeModel); 5] = [
47+
("default", llvm::CodeModel::Default),
48+
("small", llvm::CodeModel::Small),
49+
("kernel", llvm::CodeModel::Kernel),
50+
("medium", llvm::CodeModel::Medium),
51+
("large", llvm::CodeModel::Large),
52+
];
53+
3954
pub fn llvm_err(handler: &errors::Handler, msg: String) -> ! {
4055
match llvm::last_error() {
4156
Some(err) => panic!(handler.fatal(&format!("{}: {}", msg, err))),
@@ -168,12 +183,9 @@ pub fn create_target_machine(sess: &Session) -> TargetMachineRef {
168183
None => &sess.target.target.options.code_model[..],
169184
};
170185

171-
let code_model = match code_model_arg {
172-
"default" => llvm::CodeModel::Default,
173-
"small" => llvm::CodeModel::Small,
174-
"kernel" => llvm::CodeModel::Kernel,
175-
"medium" => llvm::CodeModel::Medium,
176-
"large" => llvm::CodeModel::Large,
186+
let code_model = match CODE_GEN_MODEL_ARGS.iter().find(
187+
|&&arg| arg.0 == code_model_arg) {
188+
Some(x) => x.1,
177189
_ => {
178190
sess.err(&format!("{:?} is not a valid code model",
179191
sess.opts

‎src/librustc_trans/context.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -337,16 +337,14 @@ pub fn get_reloc_model(sess: &Session) -> llvm::RelocMode {
337337
None => &sess.target.target.options.relocation_model[..],
338338
};
339339

340-
match reloc_model_arg {
341-
"pic" => llvm::RelocMode::PIC,
342-
"static" => llvm::RelocMode::Static,
343-
"default" => llvm::RelocMode::Default,
344-
"dynamic-no-pic" => llvm::RelocMode::DynamicNoPic,
340+
match ::back::write::RELOC_MODEL_ARGS.iter().find(
341+
|&&arg| arg.0 == reloc_model_arg) {
342+
Some(x) => x.1,
345343
_ => {
346344
sess.err(&format!("{:?} is not a valid relocation mode",
347345
sess.opts
348346
.cg
349-
.relocation_model));
347+
.code_model));
350348
sess.abort_if_errors();
351349
bug!();
352350
}

‎src/llvm

‎src/rustllvm/PassWrapper.cpp

+52
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,58 @@ from_rust(LLVMRustCodeGenOptLevel level)
226226
}
227227
}
228228

229+
#if LLVM_RUSTLLVM
230+
/// getLongestEntryLength - Return the length of the longest entry in the table.
231+
///
232+
static size_t getLongestEntryLength(ArrayRef<SubtargetFeatureKV> Table) {
233+
size_t MaxLen = 0;
234+
for (auto &I : Table)
235+
MaxLen = std::max(MaxLen, std::strlen(I.Key));
236+
return MaxLen;
237+
}
238+
239+
extern "C" void
240+
LLVMRustPrintTargetCPUs(LLVMTargetMachineRef TM) {
241+
const TargetMachine *Target = unwrap(TM);
242+
const MCSubtargetInfo *MCInfo = Target->getMCSubtargetInfo();
243+
const ArrayRef<SubtargetFeatureKV> CPUTable = MCInfo->getCPUTable();
244+
unsigned MaxCPULen = getLongestEntryLength(CPUTable);
245+
246+
printf("Available CPUs for this target:\n");
247+
for (auto &CPU : CPUTable)
248+
printf(" %-*s - %s.\n", MaxCPULen, CPU.Key, CPU.Desc);
249+
printf("\n");
250+
}
251+
252+
extern "C" void
253+
LLVMRustPrintTargetFeatures(LLVMTargetMachineRef TM) {
254+
const TargetMachine *Target = unwrap(TM);
255+
const MCSubtargetInfo *MCInfo = Target->getMCSubtargetInfo();
256+
const ArrayRef<SubtargetFeatureKV> FeatTable = MCInfo->getFeatureTable();
257+
unsigned MaxFeatLen = getLongestEntryLength(FeatTable);
258+
259+
printf("Available features for this target:\n");
260+
for (auto &Feature : FeatTable)
261+
printf(" %-*s - %s.\n", MaxFeatLen, Feature.Key, Feature.Desc);
262+
printf("\n");
263+
264+
printf("Use +feature to enable a feature, or -feature to disable it.\n"
265+
"For example, rustc -C -target-cpu=mycpu -C target-feature=+feature1,-feature2\n\n");
266+
}
267+
268+
#else
269+
270+
extern "C" void
271+
LLVMRustPrintTargetCPUs(LLVMTargetMachineRef) {
272+
printf("Target CPU help is not supported by this LLVM version.\n\n");
273+
}
274+
275+
extern "C" void
276+
LLVMRustPrintTargetFeatures(LLVMTargetMachineRef) {
277+
printf("Target features help is not supported by this LLVM version.\n\n");
278+
}
279+
#endif
280+
229281
extern "C" LLVMTargetMachineRef
230282
LLVMRustCreateTargetMachine(const char *triple,
231283
const char *cpu,

‎src/rustllvm/llvm-auto-clean-trigger

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
22
# The actual contents of this file do not matter, but to trigger a change on the
33
# build bots then the contents should be changed so git updates the mtime.
4-
2016-07-25b
4+
2016-08-07

0 commit comments

Comments
 (0)