Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reduce threads spawned by ui-tests #81942

Merged
merged 1 commit into from
Apr 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1156,13 +1156,15 @@ note: if you're sure you want to do this, please open an issue as to why. In the
hostflags.push(format!("-Lnative={}", builder.test_helpers_out(compiler.host).display()));
if builder.is_fuse_ld_lld(compiler.host) {
hostflags.push("-Clink-args=-fuse-ld=lld".to_string());
hostflags.push("-Clink-arg=-Wl,--threads=1".to_string());
}
cmd.arg("--host-rustcflags").arg(hostflags.join(" "));

let mut targetflags = flags;
targetflags.push(format!("-Lnative={}", builder.test_helpers_out(target).display()));
if builder.is_fuse_ld_lld(target) {
targetflags.push("-Clink-args=-fuse-ld=lld".to_string());
targetflags.push("-Clink-arg=-Wl,--threads=1".to_string());
}
cmd.arg("--target-rustcflags").arg(targetflags.join(" "));

Expand Down
2 changes: 2 additions & 0 deletions src/test/ui/asm/sym.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// min-llvm-version: 10.0.1
// FIXME(#84025): codegen-units=1 leads to linkage errors
// compile-flags: -C codegen-units=2
the8472 marked this conversation as resolved.
Show resolved Hide resolved
// only-x86_64
// only-linux
// run-pass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

// revisions: no thin fat
//[no]compile-flags: -C lto=no
//[thin]compile-flags: -C lto=thin
// FIXME(#83854) running this revision with 1 CGU triggers llvm assert in register allocator
// when executed in i686-gnu-nopt runner.
//[thin]compile-flags: -C lto=thin -Ccodegen-units=2
//[fat]compile-flags: -C lto=fat

#![feature(core_panic)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
//[no1]compile-flags: -C opt-level=1 -C lto=no
//[no2]compile-flags: -C opt-level=2 -C lto=no
//[no3]compile-flags: -C opt-level=3 -C lto=no
//[thin0]compile-flags: -C opt-level=0 -C lto=thin
// FIXME(#83854) running this revision with 1 CGU triggers llvm assert in register allocator
// when executed in dist-i586-gnu-i586-i686-musl runner.
//[thin0]compile-flags: -C opt-level=0 -C lto=thin -Ccodegen-units=2
//[thin1]compile-flags: -C opt-level=1 -C lto=thin
//[thin2]compile-flags: -C opt-level=2 -C lto=thin
//[thin3]compile-flags: -C opt-level=3 -C lto=thin
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/issues/issue-69225-SCEVAddExpr-wrap-flag.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// run-fail
// compile-flags: -C opt-level=3
// min-llvm-version: 11.0
// error-pattern: index out of bounds: the len is 0 but the index is 16777216
// ignore-wasm no panic or subprocess support
// ignore-emscripten no panic or subprocess support
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

// build-fail
// aux-build:def_colliding_external.rs
// FIXME(#83838) codegen-units=1 triggers llvm asserts
// compile-flags: -Ccodegen-units=16

extern crate def_colliding_external as dep1;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// build-fail

// FIXME(#83838) codegen-units=1 triggers llvm asserts
// compile-flags: -Ccodegen-units=16
#![feature(linkage)]

mod dep1 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: symbol `collision` is already defined
--> $DIR/linkage-detect-local-generated-name-collision.rs:9:9
--> $DIR/linkage-detect-local-generated-name-collision.rs:10:9
|
LL | pub static collision: *const i32;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
3 changes: 2 additions & 1 deletion src/test/ui/sanitize/hwaddress.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// needs-sanitizer-support
// needs-sanitizer-hwaddress
//
// compile-flags: -Z sanitizer=hwaddress -O -g
// FIXME(#83989): codegen-units=1 triggers linker errors on aarch64-gnu
// compile-flags: -Z sanitizer=hwaddress -O -g -C codegen-units=16
//
// run-fail
// error-pattern: HWAddressSanitizer: tag-mismatch
Expand Down
1 change: 1 addition & 0 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1952,6 +1952,7 @@ impl<'test> TestCx<'test> {
if !self.props.compile_flags.iter().any(|s| s.starts_with("--error-format")) {
rustc.args(&["--error-format", "json"]);
}
rustc.arg("-Ccodegen-units=1");
rustc.arg("-Zui-testing");
rustc.arg("-Zdeduplicate-diagnostics=no");
rustc.arg("-Zemit-future-incompat-report");
Expand Down