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

Expand the LLVM coverage of --print target-cpus #111274

Merged
merged 1 commit into from
May 7, 2023

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented May 6, 2023

We've been relying on a custom patch to add MCSubtargetInfo::getCPUTable
for rustc --print target-cpus, and just printing that it's not supported
on external LLVM builds. LLVM main now has getAllProcessorDescriptions
that can replace ours, so now we try to use that. In addition, the fallback
path can at least print the native and default cpu options.

There were also some mismatches in the function signatures here between
LLVM_RUSTLLVM and otherwise; this is now mitigated by sharing these
functions and only using cpp to adjust the function bodies.

We've been relying on a custom patch to add `MCSubtargetInfo::getCPUTable`
for `rustc --print target-cpus`, and just printing that it's not supported
on external LLVM builds. LLVM `main` now has `getAllProcessorDescriptions`
that can replace ours, so now we try to use that. In addition, the fallback
path can at least print the native and default cpu options.

There were also some mismatches in the function signatures here between
`LLVM_RUSTLLVM` and otherwise; this is now mitigated by sharing these
functions and only using cpp to adjust the function bodies.
@rustbot
Copy link
Collaborator

rustbot commented May 6, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 6, 2023
@cuviper
Copy link
Member Author

cuviper commented May 6, 2023

In addition, the fallback path can at least print the native and default cpu options.

Sample:

Full target CPU help is not supported by this LLVM version.

Available CPUs for this target:
    native - Select the CPU of the current host (currently znver3).
    x86-64 - This is the default target CPU for the current build target (currently x86_64-unknown-linux-gnu).

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 6, 2023

📌 Commit 67ae38a 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 May 6, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 6, 2023
…Simulacrum

Expand the LLVM coverage of `--print target-cpus`

We've been relying on a custom patch to add `MCSubtargetInfo::getCPUTable`
for `rustc --print target-cpus`, and just printing that it's not supported
on external LLVM builds. LLVM `main` now has `getAllProcessorDescriptions`
that can replace ours, so now we try to use that. In addition, the fallback
path can at least print the native and default cpu options.

There were also some mismatches in the function signatures here between
`LLVM_RUSTLLVM` and otherwise; this is now mitigated by sharing these
functions and only using cpp to adjust the function bodies.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 6, 2023
…Simulacrum

Expand the LLVM coverage of `--print target-cpus`

We've been relying on a custom patch to add `MCSubtargetInfo::getCPUTable`
for `rustc --print target-cpus`, and just printing that it's not supported
on external LLVM builds. LLVM `main` now has `getAllProcessorDescriptions`
that can replace ours, so now we try to use that. In addition, the fallback
path can at least print the native and default cpu options.

There were also some mismatches in the function signatures here between
`LLVM_RUSTLLVM` and otherwise; this is now mitigated by sharing these
functions and only using cpp to adjust the function bodies.
bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#111002 (Fix the test directories suggested by `./x.py suggest`)
 - rust-lang#111077 (Make more ConstProp tests unit.)
 - rust-lang#111151 (check bootstrap scripts syntax)
 - rust-lang#111203 (Output LLVM optimization remark kind in `-Cremark` output)
 - rust-lang#111237 (asm: loongarch64: Implementation of clobber_abi)
 - rust-lang#111274 (Expand the LLVM coverage of `--print target-cpus`)
 - rust-lang#111289 (Check arguments length in trivial diagnostic lint)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ecc0615 into rust-lang:master May 7, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 7, 2023
@cuviper cuviper deleted the print-target-cpus branch May 21, 2023 03:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants