Do not run ui test if options specific to LLVM are used when another codegen backend is used #146618
Conversation
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
rustbot
added
A-compiletest
GuillaumeGomez
changed the title
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
backend-run-llvm-options
branch
from
f2b78ae to
2c13435
Compare
|
And fixed fmt. |
| name: "needs-enzyme", | ||
| condition: config.has_enzyme, | ||
| condition: config.has_enzyme && config.default_codegen_backend.is_llvm(), | ||
| ignore_reason: "ignored when LLVM Enzyme is disabled", |
There was a problem hiding this comment.
| ignore_reason: "ignored when LLVM Enzyme is disabled", | |
| ignore_reason: "ignored when LLVM Enzyme is disabled or LLVM is not the default codegen backend", |
| name: "needs-llvm-zstd", | ||
| condition: cache.llvm_zstd, | ||
| condition: cache.llvm_zstd && config.default_codegen_backend.is_llvm(), | ||
| ignore_reason: "ignored if LLVM wasn't build with zstd for ELF section compression", |
There was a problem hiding this comment.
| ignore_reason: "ignored if LLVM wasn't build with zstd for ELF section compression", | |
| ignore_reason: "ignored if LLVM wasn't build with zstd for ELF section compression or LLVM is not the default codegen backend", |
…codegen backend is used
GuillaumeGomez
force-pushed
the
backend-run-llvm-options
branch
from
2c13435 to
a535042
Compare
|
Done! @bors r=kobzol rollup |
bors
added
S-waiting-on-bors
Rollup of 5 pull requests Successful merges: - #146442 (Display ?Sized, const, and lifetime parameters in trait item suggestions across a crate boundary) - #146474 (Improve `core::ascii` coverage) - #146605 (Bump rustfix 0.8.1 -> 0.8.7) - #146611 (bootstrap: emit hint if a config key is used in the wrong section) - #146618 (Do not run ui test if options specific to LLVM are used when another codegen backend is used) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of #146618 - GuillaumeGomez:backend-run-llvm-options, r=kobzol Do not run ui test if options specific to LLVM are used when another codegen backend is used Based on errors in #146414, some tests with LLVM-specific options are run when another codegen is actually the one used. This PR ignores these tests in such cases now to prevent this situation. r? `@kobzol`
| if config.default_codegen_backend.is_llvm() { | ||
| return IgnoreDecision::Continue; | ||
| } | ||
| return IgnoreDecision::Ignore { reason: "LLVM specific test".into() }; |
There was a problem hiding this comment.
This is not correct. needs-llvm-components is only informational so that the test is elided if the target cannot be built for using the available LLVM components. Many of these are x86 targets that we should be able to test using cg_gcc.
There was a problem hiding this comment.
In particular, needs-llvm-components is commonly used for gnarly target-specific tests that we set up with no_core so they can run on all targets; we then need to tell compiletest about that so that it knows whether building for this target is possible at all. None of these are backend-specific.
Those are never "run" tests since obviously we can't run random binaries for a different target, so most of codegen is not relevant. However, tests like tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs and its brethren are still crucial to run for all codegen backends since a bunch of the target feature logic lives inside the backends.
Based on errors in #146414, some tests with LLVM-specific options are run when another codegen is actually the one used.
This PR ignores these tests in such cases now to prevent this situation.
r? @Kobzol