Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Also sortcrt-static in--print target-features output#126424

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
bors merged 1 commit intorust-lang:masterfromEnselic:sort-target-features
Jun 15, 2024

Conversation

@Enselic
Copy link
Member

@EnselicEnselic commentedJun 13, 2024
edited
Loading

I didn't findcrt-static at first (forx86_64-unknown-linux-gnu), because it was put at the bottom of the large and otherwise sorted list.

Fully sort the list before we print it.

Note thatllvm_target_features starts out and remains sorted and does not need to be sorted an extra time.

On my machine the diff is just:

$ diff -u /tmp/before2.txt /tmp/after2.txt--- /tmp/before2.txt    2024-06-13 20:40:27.091636592 +0200+++ /tmp/after2.txt     2024-06-13 20:39:54.584894891 +0200@@ -20,6 +20,7 @@     bmi1                            - Support BMI instructions.     bmi2                            - Support BMI2 instructions.     cmpxchg16b                      - 64-bit with cmpxchg16b (this is true for most x86-64 chips, but not the first AMD chips).+    crt-static                      - Enables C Run-time Libraries to be statically linked.     ermsb                           - REP MOVS/STOS are fast.     f16c                            - Support 16-bit floating point conversion instructions.     fma                             - Enable three-operand fused multiple-add.@@ -49,7 +50,6 @@     xsavec                          - Support xsavec instructions.     xsaveopt                        - Support xsaveopt instructions.     xsaves                          - Support xsaves instructions.-    crt-static                      - Enables C Run-time Libraries to be statically linked. Code-generation features supported by LLVM for this target:     16bit-mode                      - 16-bit mode (i8086).

I couldn't find a ui test that tested this output. Let's see if CI finds a regression tests.

@rustbot
Copy link
Collaborator

r?@lcnr

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

User? to explicitly pick a reviewer

@rustbotrustbot added S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties. T-compilerRelevant to the compiler team, which will review and decide on the PR/issue. labelsJun 13, 2024
rustc_target_features.sort();

llvm_target_features.retain(|(f, _d)| !known_llvm_target_features.contains(f));
llvm_target_features.sort();
Copy link
Member

Choose a reason for hiding this comment

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

could the llvm target features already be sorted? there's a binary search just above

Enselic reacted with eyes emoji
Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Yes,llvm_target_features appears to be sorted.

Turns out there is no regression test for the output. Probably because it is highly target specific and probably would be a pain to maintain.

Copy link
Member

Choose a reason for hiding this comment

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

We do have a few that check--print and-Z output so it was still worth a shot, but they should have failed locally.

@rust-log-analyzer

This comment was marked as outdated.

@lqd
Copy link
Member

lqd commentedJun 13, 2024
edited
Loading

(cc#126430 on that last failure, which is unfortunate as it stops CI from possibly finding a failing test for this PR...)

Enselic reacted with thumbs up emoji

@lcnr
Copy link
Contributor

r?@lqd

@rustbotrustbot assignedlqd and unassignedlcnrJun 14, 2024
@lqd
Copy link
Member

lqd commentedJun 14, 2024
edited
Loading

Relaunched PR CI jobs now that the rustdoc tests are fixed

This LGTM once we have the answer on the existing order.

I didn't find `crt-static` at first (for `x86_64-unknown-linux-gnu`),because it was put at the bottom the large and otherwise sorted list.Fully sort the list before we print it.Note that `llvm_target_features` starts out sorted and does not need tobe sorted an extra time.
@EnselicEnselic changed the titleSort output of--print target-features Also sortcrt-static in--print target-features outputJun 14, 2024
@EnselicEnselic marked this pull request as ready for reviewJune 14, 2024 18:30
@lqd
Copy link
Member

lqd commentedJun 14, 2024

Thanks!

@bors r+

@bors
Copy link
Collaborator

📌 Commit04af371 has been approved bylqd

It is now in thequeue for this repository.

@borsbors added S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties. labelsJun 14, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull requestJun 15, 2024
 Also sort `crt-static` in `--print target-features` outputI didn't find `crt-static` at first (for `x86_64-unknown-linux-gnu`), because it was put at the bottom of the large and otherwise sorted list.Fully sort the list before we print it.Note that `llvm_target_features` starts out and remains sorted and does not need to be sorted an extra time.On my machine the diff is just:```diff$ diff -u /tmp/before2.txt /tmp/after2.txt--- /tmp/before2.txt    2024-06-13 20:40:27.091636592 +0200+++ /tmp/after2.txt     2024-06-13 20:39:54.584894891 +0200`@@` -20,6 +20,7 `@@`     bmi1                            - Support BMI instructions.     bmi2                            - Support BMI2 instructions.     cmpxchg16b                      - 64-bit with cmpxchg16b (this is true for most x86-64 chips, but not the first AMD chips).+    crt-static                      - Enables C Run-time Libraries to be statically linked.     ermsb                           - REP MOVS/STOS are fast.     f16c                            - Support 16-bit floating point conversion instructions.     fma                             - Enable three-operand fused multiple-add.`@@` -49,7 +50,6 `@@`     xsavec                          - Support xsavec instructions.     xsaveopt                        - Support xsaveopt instructions.     xsaves                          - Support xsaves instructions.-    crt-static                      - Enables C Run-time Libraries to be statically linked. Code-generation features supported by LLVM for this target:     16bit-mode                      - 16-bit mode (i8086).```I couldn't find a ui test that tested this output. Let's see if CI finds a regression tests.
bors added a commit to rust-lang-ci/rust that referenced this pull requestJun 15, 2024
…iaskrgrRollup of 10 pull requestsSuccessful merges: -rust-lang#125829 (rustc_span: Add conveniences for working with span formats) -rust-lang#126279 (Migrate `inaccessible-temp-dir`, `output-with-hyphens` and `issue-10971-temps-dir` `run-make` tests to `rmake`) -rust-lang#126361 (Unify intrinsics body handling in StableMIR) -rust-lang#126417 (Add `f16` and `f128` inline ASM support for `x86` and `x86-64`) -rust-lang#126424 ( Also sort `crt-static` in `--print target-features` output) -rust-lang#126428 (Polish `std::path::absolute` documentation.) -rust-lang#126429 (Add `f16` and `f128` const eval for binary and unary operationations) -rust-lang#126448 (End support for Python 3.8 in tidy) -rust-lang#126488 (Use `std::path::absolute` in bootstrap) -rust-lang#126511 (.mailmap: Associate both my work and my private email with me)r? `@ghost``@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull requestJun 15, 2024
…iaskrgrRollup of 9 pull requestsSuccessful merges: -rust-lang#125829 (rustc_span: Add conveniences for working with span formats) -rust-lang#126361 (Unify intrinsics body handling in StableMIR) -rust-lang#126417 (Add `f16` and `f128` inline ASM support for `x86` and `x86-64`) -rust-lang#126424 ( Also sort `crt-static` in `--print target-features` output) -rust-lang#126428 (Polish `std::path::absolute` documentation.) -rust-lang#126429 (Add `f16` and `f128` const eval for binary and unary operationations) -rust-lang#126448 (End support for Python 3.8 in tidy) -rust-lang#126488 (Use `std::path::absolute` in bootstrap) -rust-lang#126511 (.mailmap: Associate both my work and my private email with me)r? `@ghost``@rustbot` modify labels: rollup
@borsbors merged commit21de992 intorust-lang:masterJun 15, 2024
@rustbotrustbot added this to the1.81.0 milestoneJun 15, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull requestJun 15, 2024
Rollup merge ofrust-lang#126424 - Enselic:sort-target-features, r=lqd Also sort `crt-static` in `--print target-features` outputI didn't find `crt-static` at first (for `x86_64-unknown-linux-gnu`), because it was put at the bottom of the large and otherwise sorted list.Fully sort the list before we print it.Note that `llvm_target_features` starts out and remains sorted and does not need to be sorted an extra time.On my machine the diff is just:```diff$ diff -u /tmp/before2.txt /tmp/after2.txt--- /tmp/before2.txt    2024-06-13 20:40:27.091636592 +0200+++ /tmp/after2.txt     2024-06-13 20:39:54.584894891 +0200``@@`` -20,6 +20,7 ``@@``     bmi1                            - Support BMI instructions.     bmi2                            - Support BMI2 instructions.     cmpxchg16b                      - 64-bit with cmpxchg16b (this is true for most x86-64 chips, but not the first AMD chips).+    crt-static                      - Enables C Run-time Libraries to be statically linked.     ermsb                           - REP MOVS/STOS are fast.     f16c                            - Support 16-bit floating point conversion instructions.     fma                             - Enable three-operand fused multiple-add.``@@`` -49,7 +50,6 ``@@``     xsavec                          - Support xsavec instructions.     xsaveopt                        - Support xsaveopt instructions.     xsaves                          - Support xsaves instructions.-    crt-static                      - Enables C Run-time Libraries to be statically linked. Code-generation features supported by LLVM for this target:     16bit-mode                      - 16-bit mode (i8086).```I couldn't find a ui test that tested this output. Let's see if CI finds a regression tests.
@EnselicEnselic deleted the sort-target-features branchJune 15, 2024 17:15
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@lqdlqdlqd left review comments

Assignees

@lqdlqd

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.81.0

Development

Successfully merging this pull request may close these issues.

6 participants

@Enselic@rustbot@rust-log-analyzer@lqd@lcnr@bors

[8]ページ先頭

©2009-2025 Movatter.jp