Rename directive needs-profiler-support
to needs-profiler-runtime
This commit is contained in:
parent
4203c68613
commit
622d5898c2
@ -129,7 +129,7 @@
|
|||||||
"needs-git-hash",
|
"needs-git-hash",
|
||||||
"needs-llvm-components",
|
"needs-llvm-components",
|
||||||
"needs-llvm-zstd",
|
"needs-llvm-zstd",
|
||||||
"needs-profiler-support",
|
"needs-profiler-runtime",
|
||||||
"needs-relocation-model-pic",
|
"needs-relocation-model-pic",
|
||||||
"needs-run-enabled",
|
"needs-run-enabled",
|
||||||
"needs-rust-lld",
|
"needs-rust-lld",
|
||||||
|
@ -385,7 +385,7 @@ pub struct Config {
|
|||||||
pub git_merge_commit_email: String,
|
pub git_merge_commit_email: String,
|
||||||
|
|
||||||
/// True if the profiler runtime is enabled for this target.
|
/// True if the profiler runtime is enabled for this target.
|
||||||
/// Used by the "needs-profiler-support" header in test files.
|
/// Used by the "needs-profiler-runtime" directive in test files.
|
||||||
pub profiler_support: bool,
|
pub profiler_support: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -851,7 +851,7 @@ fn iter_header(
|
|||||||
// FIXME(jieyouxu): I feel like there's a better way to do this, leaving for later.
|
// FIXME(jieyouxu): I feel like there's a better way to do this, leaving for later.
|
||||||
if mode == Mode::CoverageRun {
|
if mode == Mode::CoverageRun {
|
||||||
let extra_directives: &[&str] = &[
|
let extra_directives: &[&str] = &[
|
||||||
"needs-profiler-support",
|
"needs-profiler-runtime",
|
||||||
// FIXME(pietroalbini): this test currently does not work on cross-compiled targets
|
// FIXME(pietroalbini): this test currently does not work on cross-compiled targets
|
||||||
// because remote-test is not capable of sending back the *.profraw files generated by
|
// because remote-test is not capable of sending back the *.profraw files generated by
|
||||||
// the LLVM instrumentation.
|
// the LLVM instrumentation.
|
||||||
|
@ -100,9 +100,9 @@ pub(super) fn handle_needs(
|
|||||||
ignore_reason: "ignored on targets without unwinding support",
|
ignore_reason: "ignored on targets without unwinding support",
|
||||||
},
|
},
|
||||||
Need {
|
Need {
|
||||||
name: "needs-profiler-support",
|
name: "needs-profiler-runtime",
|
||||||
condition: cache.profiler_support,
|
condition: cache.profiler_support,
|
||||||
ignore_reason: "ignored when profiler support is disabled",
|
ignore_reason: "ignored when the profiler runtime is not available",
|
||||||
},
|
},
|
||||||
Need {
|
Need {
|
||||||
name: "needs-force-clang-based-tests",
|
name: "needs-force-clang-based-tests",
|
||||||
|
@ -370,10 +370,10 @@ fn sanitizers() {
|
|||||||
#[test]
|
#[test]
|
||||||
fn profiler_support() {
|
fn profiler_support() {
|
||||||
let config: Config = cfg().profiler_support(false).build();
|
let config: Config = cfg().profiler_support(false).build();
|
||||||
assert!(check_ignore(&config, "//@ needs-profiler-support"));
|
assert!(check_ignore(&config, "//@ needs-profiler-runtime"));
|
||||||
|
|
||||||
let config: Config = cfg().profiler_support(true).build();
|
let config: Config = cfg().profiler_support(true).build();
|
||||||
assert!(!check_ignore(&config, "//@ needs-profiler-support"));
|
assert!(!check_ignore(&config, "//@ needs-profiler-runtime"));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
// RUSTBUILD_FORCE_CLANG_BASED_TESTS and only runs tests which contain "clang" in their
|
// RUSTBUILD_FORCE_CLANG_BASED_TESTS and only runs tests which contain "clang" in their
|
||||||
// name.
|
// name.
|
||||||
|
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
// FIXME(Oneirical): Except that due to the reliance on llvm-profdata, this test
|
// FIXME(Oneirical): Except that due to the reliance on llvm-profdata, this test
|
||||||
// never runs, because `x86_64-gnu-debug` does not have the `profiler_builtins` crate.
|
// never runs, because `x86_64-gnu-debug` does not have the `profiler_builtins` crate.
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
// the output remark files.
|
// the output remark files.
|
||||||
// See https://github.com/rust-lang/rust/pull/114439
|
// See https://github.com/rust-lang/rust/pull/114439
|
||||||
|
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
//@ ignore-cross-compile
|
//@ ignore-cross-compile
|
||||||
|
|
||||||
use run_make_support::{
|
use run_make_support::{
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
// If the test passes, the expected function call count was added to the use-phase LLVM-IR.
|
// If the test passes, the expected function call count was added to the use-phase LLVM-IR.
|
||||||
// See https://github.com/rust-lang/rust/pull/66631
|
// See https://github.com/rust-lang/rust/pull/66631
|
||||||
|
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
//@ ignore-cross-compile
|
//@ ignore-cross-compile
|
||||||
|
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
// should be generated.
|
// should be generated.
|
||||||
// See https://github.com/rust-lang/rust/pull/48346
|
// See https://github.com/rust-lang/rust/pull/48346
|
||||||
|
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
// Reason: this exercises LTO profiling
|
// Reason: this exercises LTO profiling
|
||||||
//@ ignore-cross-compile
|
//@ ignore-cross-compile
|
||||||
// Reason: the compiled binary is executed
|
// Reason: the compiled binary is executed
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
// optimizes code. This test checks that these files are generated.
|
// optimizes code. This test checks that these files are generated.
|
||||||
// See https://github.com/rust-lang/rust/pull/48346
|
// See https://github.com/rust-lang/rust/pull/48346
|
||||||
|
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
//@ ignore-cross-compile
|
//@ ignore-cross-compile
|
||||||
|
|
||||||
use run_make_support::{cwd, has_extension, has_prefix, run, rustc, shallow_find_files};
|
use run_make_support::{cwd, has_extension, has_prefix, run, rustc, shallow_find_files};
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
// whether it can make a direct call instead of the indirect call.
|
// whether it can make a direct call instead of the indirect call.
|
||||||
// See https://github.com/rust-lang/rust/pull/66631
|
// See https://github.com/rust-lang/rust/pull/66631
|
||||||
|
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
// Reason: llvm_profdata is used
|
// Reason: llvm_profdata is used
|
||||||
//@ ignore-cross-compile
|
//@ ignore-cross-compile
|
||||||
// Reason: the compiled binary is executed
|
// Reason: the compiled binary is executed
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
// be marked as cold.
|
// be marked as cold.
|
||||||
// See https://github.com/rust-lang/rust/pull/60262
|
// See https://github.com/rust-lang/rust/pull/60262
|
||||||
|
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
//@ ignore-cross-compile
|
//@ ignore-cross-compile
|
||||||
|
|
||||||
use run_make_support::{
|
use run_make_support::{
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
// See https://github.com/rust-lang/rust/pull/42433
|
// See https://github.com/rust-lang/rust/pull/42433
|
||||||
|
|
||||||
//@ ignore-cross-compile
|
//@ ignore-cross-compile
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
|
|
||||||
use run_make_support::{path, run, rustc};
|
use run_make_support::{path, run, rustc};
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
//@ ignore-cross-compile
|
//@ ignore-cross-compile
|
||||||
// Reason: the binary is executed
|
// Reason: the binary is executed
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
|
|
||||||
use run_make_support::{llvm_profdata, rfs, run, rustc};
|
use run_make_support::{llvm_profdata, rfs, run, rustc};
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#![cfg_attr(feat, feature(coverage_attribute))]
|
#![cfg_attr(feat, feature(coverage_attribute))]
|
||||||
//@ revisions: feat nofeat
|
//@ revisions: feat nofeat
|
||||||
//@ compile-flags: -Cinstrument-coverage
|
//@ compile-flags: -Cinstrument-coverage
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
|
|
||||||
// Malformed `#[coverage(..)]` attributes should not cause an ICE when built
|
// Malformed `#[coverage(..)]` attributes should not cause an ICE when built
|
||||||
// with `-Cinstrument-coverage`.
|
// with `-Cinstrument-coverage`.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
//@ compile-flags: -Cinstrument-coverage -Ccodegen-units=4 --crate-type dylib -Copt-level=0
|
//@ compile-flags: -Cinstrument-coverage -Ccodegen-units=4 --crate-type dylib -Copt-level=0
|
||||||
//@ build-pass
|
//@ build-pass
|
||||||
//@ needs-profiler-support
|
//@ needs-profiler-runtime
|
||||||
//@ needs-dynamic-linking
|
//@ needs-dynamic-linking
|
||||||
|
|
||||||
// Regression test for #85461 where MSVC sometimes fails to link instrument-coverage binaries
|
// Regression test for #85461 where MSVC sometimes fails to link instrument-coverage binaries
|
||||||
|
Loading…
Reference in New Issue
Block a user