Add all known `target_feature` configs to check-cfg #118908

Urgau · 2023-12-13T09:13:28Z

This PR adds all the known target_feature from ~~rustc_codegen_ssa~~ rustc_target to the well known list of check-cfg.

It does so by moving the list from rustc_codegen_ssa to rustc_target ~~rustc_session (I not sure about this, but some of the moved function take a Session)~~, then using it the fill_well_known function.

This already proved to be useful since portable-simd had a bad cfg.

cc @nnethercote (since we discussed it in #118494)

rustbot · 2023-12-13T09:13:39Z

r? @TaKO8Ki

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

rustbot · 2023-12-13T09:13:41Z

Portable SIMD is developed in its own repository. If possible, consider making this change to rust-lang/portable-simd instead.

cc @calebzulawski, @programmerjake

rustbot · 2023-12-13T09:25:15Z

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

Portable SIMD is developed in its own repository. If possible, consider making this change to rust-lang/portable-simd instead.

cc @calebzulawski, @programmerjake

GuillaumeGomez

Looks super cool, thanks!

workingjubilee · 2023-12-13T10:07:44Z

Is there any chance the target features can be somewhere like rustc_target?

Urgau · 2023-12-13T10:15:51Z

Is there any chance the target features can be somewhere like rustc_target?

It should be possible if we are willing to publicly expose the individual lists or remove the Session parameter and use a &str instead.

Basically everywhere we can have a dependency on rustc_span should be possible implementation-wise, since it's quite possible that we will need to make the target features pre-interned symbols for perf reason.

workingjubilee · 2023-12-13T10:17:51Z

compiler/rustc_session/src/target_features.rs

+pub fn supported_target_features(sess: &crate::Session) -> &'static [(&'static str, Stability)] {
+    match &*sess.target.arch {
+        "arm" => ARM_ALLOWED_FEATURES,
+        "aarch64" => AARCH64_ALLOWED_FEATURES,
+        "x86" | "x86_64" => X86_ALLOWED_FEATURES,
+        "hexagon" => HEXAGON_ALLOWED_FEATURES,
+        "mips" | "mips32r6" | "mips64" | "mips64r6" => MIPS_ALLOWED_FEATURES,
+        "powerpc" | "powerpc64" => POWERPC_ALLOWED_FEATURES,
+        "riscv32" | "riscv64" => RISCV_ALLOWED_FEATURES,
+        "wasm32" | "wasm64" => WASM_ALLOWED_FEATURES,
+        "bpf" => BPF_ALLOWED_FEATURES,
+        "csky" => CSKY_ALLOWED_FEATURES,
+        "loongarch64" => LOONGARCH_ALLOWED_FEATURES,
+        _ => &[],
+    }
+}
+
+pub fn tied_target_features(sess: &crate::Session) -> &'static [&'static [&'static str]] {
+    match &*sess.target.arch {
+        "aarch64" => AARCH64_TIED_FEATURES,
+        _ => &[],
+    }
+}


These taking a Session is not particularly intrinsic to their functionality. What matters is that we're burning a path to sess.target.arch, which means we're already going through rustc_target::Target. These can be turned into functions implemented on Target.

Done. This is much cleaner now. Thank you very much.

workingjubilee

With that, the portable-simd change looks good to me. Thanks!

TaKO8Ki · 2023-12-14T07:53:47Z

Thanks! @bors r+

bors · 2023-12-14T07:53:49Z

📌 Commit fb9b31c has been approved by TaKO8Ki

It is now in the queue for this repository.

bors · 2023-12-14T13:13:02Z

⌛ Testing commit fb9b31c with merge b1dc6c0...

…aKO8Ki Add all known `target_feature` configs to check-cfg This PR adds all the known `target_feature` from ~~`rustc_codegen_ssa`~~ `rustc_target` to the well known list of check-cfg. It does so by moving the list from `rustc_codegen_ssa` to `rustc_target` ~~`rustc_session` (I not sure about this, but some of the moved function take a `Session`)~~, then using it the `fill_well_known` function. This already proved to be useful since portable-simd had a bad cfg. cc `@nnethercote` (since we discussed it in rust-lang#118494)

bors · 2023-12-14T13:29:41Z

💔 Test failed - checks-actions

Urgau · 2023-12-14T14:19:51Z

The job x86_64-gnu-llvm-16 failed! Check out the build log: (web) (plain)

Fixed the conflicts with #118213. Should be ready for re-approval.

@rustbot ready

workingjubilee · 2023-12-15T00:04:33Z

@bors r=TaKO8Ki,GuillaumeGomez,workingjubilee

bors · 2023-12-15T00:04:36Z

📌 Commit 3ea1331 has been approved by TaKO8Ki,GuillaumeGomez,workingjubilee

It is now in the queue for this repository.

…kingjubilee Rollup of 4 pull requests Successful merges: - rust-lang#118908 (Add all known `target_feature` configs to check-cfg) - rust-lang#118933 (Cleanup errors handlers even more) - rust-lang#118943 (update `measureme` to 10.1.2 to deduplicate `parking_lot`) - rust-lang#118948 (Use the `Waker::noop` API in tests) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#118908 - Urgau:check-cfg-target-features, r=TaKO8Ki,GuillaumeGomez,workingjubilee Add all known `target_feature` configs to check-cfg This PR adds all the known `target_feature` from ~~`rustc_codegen_ssa`~~ `rustc_target` to the well known list of check-cfg. It does so by moving the list from `rustc_codegen_ssa` to `rustc_target` ~~`rustc_session` (I not sure about this, but some of the moved function take a `Session`)~~, then using it the `fill_well_known` function. This already proved to be useful since portable-simd had a bad cfg. cc `@nnethercote` (since we discussed it in rust-lang#118494)

rustbot assigned TaKO8Ki Dec 13, 2023

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 Dec 13, 2023

This comment has been minimized.

Sign in to view

Urgau force-pushed the check-cfg-target-features branch from 7ddc854 to 3f58f62 Compare December 13, 2023 09:25

This comment has been minimized.

Sign in to view

Urgau force-pushed the check-cfg-target-features branch from 3f58f62 to ada0e07 Compare December 13, 2023 09:32

GuillaumeGomez approved these changes Dec 13, 2023

View reviewed changes

workingjubilee reviewed Dec 13, 2023

View reviewed changes

Urgau force-pushed the check-cfg-target-features branch from ada0e07 to fb9b31c Compare December 13, 2023 10:48

workingjubilee approved these changes Dec 13, 2023

View reviewed changes

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 Dec 14, 2023

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 14, 2023

Urgau added 4 commits December 14, 2023 14:40

Move rustc_codegen_ssa target features to rustc_target

428395e

Use all the known features in check-cfg

acac133

Don't forget pure rustc target features in check-cfg

c355040

Fix target_feature config in portable-simd

3ea1331

Urgau force-pushed the check-cfg-target-features branch from fb9b31c to 3ea1331 Compare December 14, 2023 13:52

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 Dec 15, 2023

workingjubilee mentioned this pull request Dec 15, 2023

Rollup of 4 pull requests #118957

Merged

bors merged commit 576a74b into rust-lang:master Dec 15, 2023

rustbot added this to the 1.76.0 milestone Dec 15, 2023

Add all known target_feature configs to check-cfg #118908

Add all known target_feature configs to check-cfg #118908

Uh oh!

Conversation

Urgau commented Dec 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Dec 13, 2023

Uh oh!

rustbot commented Dec 13, 2023

Uh oh!

This comment has been minimized.

rustbot commented Dec 13, 2023

Uh oh!

This comment has been minimized.

GuillaumeGomez left a comment

Choose a reason for hiding this comment

Uh oh!

workingjubilee commented Dec 13, 2023

Uh oh!

Urgau commented Dec 13, 2023

Uh oh!

workingjubilee Dec 13, 2023

Choose a reason for hiding this comment

Uh oh!

Urgau Dec 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

workingjubilee left a comment

Choose a reason for hiding this comment

Uh oh!

TaKO8Ki commented Dec 14, 2023

Uh oh!

bors commented Dec 14, 2023

Uh oh!

bors commented Dec 14, 2023

Uh oh!

This comment has been minimized.

bors commented Dec 14, 2023

Uh oh!

Urgau commented Dec 14, 2023

Uh oh!

workingjubilee commented Dec 15, 2023

Uh oh!

bors commented Dec 15, 2023

Uh oh!

Uh oh!

Add all known `target_feature` configs to check-cfg #118908

Add all known `target_feature` configs to check-cfg #118908

Urgau commented Dec 13, 2023 •

edited

Loading

Urgau Dec 13, 2023 •

edited

Loading