Skip to content

Add missing needs-llvm-components directives for run-make tests that need target-specific codegen#129605

Merged
bors merged 2 commits intorust-lang:masterfrom
jieyouxu:needs-llvm-components
Aug 31, 2024
Merged

Add missing needs-llvm-components directives for run-make tests that need target-specific codegen#129605
bors merged 2 commits intorust-lang:masterfrom
jieyouxu:needs-llvm-components

Conversation

@jieyouxu
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu commented Aug 26, 2024 •
edited
Loading

Without suitable needs-llvm-components directives, some run-make tests exercising target-specific codegen can fail if the LLVM used is built without the necessary components. Currently, the list is:

tests\run-make\print-target-list
tests\run-make\print-to-output
tests\run-make\print-cfg
tests\run-make\target-without-atomic-cas

This PR also skips tidy checks for revisions and needs-llvm-components for run-make tests since revisions are not supported.

Fixes #129390.
Fixes #127895.

cc @petrochenkov who noticed this, thanks! Would be great if you could confirm that this fixes the test errors for you locally.

@jieyouxu
tidy: skip revision llvm-components check for run-make tests
92b1081 
Since run-make tests do not support revisions.
@jieyouxu
tests/run-make: add missing needs-llvm-components
beaf9d1 
Without suitable `needs-llvm-components` directives, these tests that
rely on target-specific codegen can fail if used with a LLVM that is
built without the required components.
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Aug 26, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Aug 26, 2024
jieyouxu
jieyouxu commented Aug 26, 2024
View reviewed changes
tests/run-make/print-target-list/rmake.rs
Comment on lines +5 to +7
//@ needs-llvm-components: aarch64 arm avr bpf csky hexagon loongarch m68k mips msp430 nvptx powerpc riscv sparc systemz webassembly x86
// FIXME(jieyouxu): there has to be a better way to do this, without the needs-llvm-components it
// will fail on LLVM built without all of the components listed above.
Copy link
Copy Markdown
Member Author

@jieyouxu jieyouxu Aug 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of this, but I also am not sure if there's a better way

Copy link
Copy Markdown
Member

@cuviper cuviper Aug 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe rustc should be filtering this before printing targets anyway? Or else it could do a better job of avoiding LLVM initialization when it's not really needed -- e.g. I see no reason why --print sysroot should care.

That might also help coreos/cargo-vendor-filterer#87

@petrochenkov
Copy link
Copy Markdown
Contributor

petrochenkov commented Aug 26, 2024

Would be great if you could confirm that this fixes the test errors for you locally.

I confirm, there are no errors in run-make tests on my setup with this change.

@jieyouxu
Copy link
Copy Markdown
Member Author

jieyouxu commented Aug 26, 2024

Thanks!

@Mark-Simulacrum
Copy link
Copy Markdown
Member

Mark-Simulacrum commented Aug 31, 2024

@bors r+

@bors
Copy link
Copy Markdown
Collaborator

bors commented Aug 31, 2024

📌 Commit beaf9d1 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 31, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 31, 2024
@matthiaskrgr
Rollup merge of rust-lang#129605 - jieyouxu:needs-llvm-components, r=…
004014a 
…Mark-Simulacrum

Add missing `needs-llvm-components` directives for run-make tests that need target-specific codegen

Without suitable `needs-llvm-components` directives, some run-make tests exercising target-specific codegen can fail if the LLVM used is built without the necessary components. Currently, the list is:

```
tests\run-make\print-target-list
tests\run-make\print-to-output
tests\run-make\print-cfg
tests\run-make\target-without-atomic-cas
```

This PR also skips tidy checks for revisions and `needs-llvm-components` for run-make tests since revisions are not supported.

Fixes rust-lang#129390.
Fixes rust-lang#127895.

cc `@petrochenkov` who noticed this, thanks! Would be great if you could confirm that this fixes the test errors for you locally.
This was referenced Aug 31, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@bors
Auto merge of rust-lang#129831 - matthiaskrgr:rollup-befq6zx, r=matth…
d37b074 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#128523 (Add release notes for 1.81.0)
 - rust-lang#129605 (Add missing `needs-llvm-components` directives for run-make tests that need target-specific codegen)
 - rust-lang#129650 (Clean up `library/profiler_builtins/build.rs`)
 - rust-lang#129651 (skip stage 0 target check if `BOOTSTRAP_SKIP_TARGET_SANITY` is set)
 - rust-lang#129684 (Enable Miri to pass pointers through FFI)
 - rust-lang#129762 (Update the `wasm-component-ld` binary dependency)
 - rust-lang#129782 (couple more crash tests)
 - rust-lang#129816 (tidy: say which feature gate has a stability issue mismatch)
 - rust-lang#129818 (make the const-unstable-in-stable error more clear)
 - rust-lang#129824 (Fix code examples buttons not appearing on click on mobile)
 - rust-lang#129826 (library: Fix typo in `core::mem`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@bors
Auto merge of rust-lang#129831 - matthiaskrgr:rollup-befq6zx, r=matth…
a7399ba 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#128523 (Add release notes for 1.81.0)
 - rust-lang#129605 (Add missing `needs-llvm-components` directives for run-make tests that need target-specific codegen)
 - rust-lang#129650 (Clean up `library/profiler_builtins/build.rs`)
 - rust-lang#129651 (skip stage 0 target check if `BOOTSTRAP_SKIP_TARGET_SANITY` is set)
 - rust-lang#129684 (Enable Miri to pass pointers through FFI)
 - rust-lang#129762 (Update the `wasm-component-ld` binary dependency)
 - rust-lang#129782 (couple more crash tests)
 - rust-lang#129816 (tidy: say which feature gate has a stability issue mismatch)
 - rust-lang#129818 (make the const-unstable-in-stable error more clear)
 - rust-lang#129824 (Fix code examples buttons not appearing on click on mobile)
 - rust-lang#129826 (library: Fix typo in `core::mem`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d354d4d into rust-lang:master Aug 31, 2024
@rustbot rustbot added this to the 1.82.0 milestone Aug 31, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@rust-timer
Unrolled build for rust-lang#129605
bfb6bb7 
Rollup merge of rust-lang#129605 - jieyouxu:needs-llvm-components, r=Mark-Simulacrum

Add missing `needs-llvm-components` directives for run-make tests that need target-specific codegen

Without suitable `needs-llvm-components` directives, some run-make tests exercising target-specific codegen can fail if the LLVM used is built without the necessary components. Currently, the list is:

```
tests\run-make\print-target-list
tests\run-make\print-to-output
tests\run-make\print-cfg
tests\run-make\target-without-atomic-cas
```

This PR also skips tidy checks for revisions and `needs-llvm-components` for run-make tests since revisions are not supported.

Fixes rust-lang#129390.
Fixes rust-lang#127895.

cc ``@petrochenkov`` who noticed this, thanks! Would be great if you could confirm that this fixes the test errors for you locally.
@jieyouxu jieyouxu deleted the needs-llvm-components branch October 21, 2024 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cuviper cuviper cuviper left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

No open projects
Oxidizing run-make tests
Status: Done

Milestone

1.82.0

Development

Successfully merging this pull request may close these issues.

run-make: audit tests that codegen for specific targets tests/run-make/print-target-list --print=sysroot check fails for experimental llvm targets

6 participants

@jieyouxu @rustbot @petrochenkov @Mark-Simulacrum @bors @cuviper