Skip to content

Commit c50e19b

Browse files
jieyouxujieyouxu
authored
Rollup merge of #133384 - RalfJung:vector-abi-check-tests, r=jieyouxu
add a test for target-feature-ABI warnings in closures and when calling extern fn Also update the comment regarding the inheritance of target features into closures, to make it more clear that we really shouldn't do this right now.
2 parents 1741b39 + 3440505 commit c50e19b

File tree

3 files changed

+95
-22
lines changed

3 files changed

+95
-22
lines changed

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,9 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
576576
// If this closure is marked `#[inline(always)]`, simply skip adding `#[target_feature]`.
577577
//
578578
// At this point, `unsafe` has already been checked and `#[target_feature]` only affects codegen.
579-
// Emitting both `#[inline(always)]` and `#[target_feature]` can potentially result in an
580-
// ICE, because LLVM errors when the function fails to be inlined due to a target feature
581-
// mismatch.
579+
// Due to LLVM limitations, emitting both `#[inline(always)]` and `#[target_feature]` is *unsound*:
580+
// the function may be inlined into a caller with fewer target features. Also see
581+
// <https://github.com/rust-lang/rust/issues/116573>.
582582
//
583583
// Using `#[inline(always)]` implies that this closure will most likely be inlined into
584584
// its parent function, which effectively inherits the features anyway. Boxing this closure

‎tests/ui/simd-abi-checks.rs‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#![feature(avx512_target_feature)]
66
#![feature(portable_simd)]
7+
#![feature(target_feature_11, simd_ffi)]
78
#![allow(improper_ctypes_definitions)]
89

910
use std::arch::x86_64::*;
@@ -50,6 +51,14 @@ unsafe fn test() {
5051
as_f64x8(arg);
5152
}
5253

54+
#[target_feature(enable = "avx")]
55+
unsafe fn in_closure() -> impl FnOnce() -> __m256 {
56+
#[inline(always)] // this disables target-feature inheritance
57+
|| g()
58+
//~^ WARNING this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
59+
//~| WARNING this was previously accepted by the compiler
60+
}
61+
5362
fn main() {
5463
unsafe {
5564
f(g());
@@ -78,4 +87,24 @@ fn main() {
7887
//~| WARNING this was previously accepted by the compiler
7988
//~| WARNING this was previously accepted by the compiler
8089
}
90+
91+
unsafe {
92+
in_closure()();
93+
}
94+
95+
unsafe {
96+
#[expect(improper_ctypes)]
97+
extern "C" {
98+
fn some_extern() -> __m256;
99+
}
100+
some_extern();
101+
//~^ WARNING this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
102+
//~| WARNING this was previously accepted by the compiler
103+
}
104+
}
105+
106+
#[no_mangle]
107+
#[target_feature(enable = "avx")]
108+
fn some_extern() -> __m256 {
109+
todo!()
81110
}

‎tests/ui/simd-abi-checks.stderr‎

Lines changed: 63 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
2-
--> $DIR/simd-abi-checks.rs:55:11
2+
--> $DIR/simd-abi-checks.rs:64:11
33
|
44
LL | f(g());
55
| ^^^ function called here
@@ -10,7 +10,7 @@ LL | f(g());
1010
= note: `#[warn(abi_unsupported_vector_types)]` on by default
1111

1212
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
13-
--> $DIR/simd-abi-checks.rs:55:9
13+
--> $DIR/simd-abi-checks.rs:64:9
1414
|
1515
LL | f(g());
1616
| ^^^^^^ function called here
@@ -20,7 +20,7 @@ LL | f(g());
2020
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
2121

2222
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
23-
--> $DIR/simd-abi-checks.rs:63:14
23+
--> $DIR/simd-abi-checks.rs:72:14
2424
|
2525
LL | gavx(favx());
2626
| ^^^^^^ function called here
@@ -30,7 +30,7 @@ LL | gavx(favx());
3030
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
3131

3232
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
33-
--> $DIR/simd-abi-checks.rs:63:9
33+
--> $DIR/simd-abi-checks.rs:72:9
3434
|
3535
LL | gavx(favx());
3636
| ^^^^^^^^^^^^ function called here
@@ -40,7 +40,7 @@ LL | gavx(favx());
4040
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
4141

4242
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
43-
--> $DIR/simd-abi-checks.rs:75:19
43+
--> $DIR/simd-abi-checks.rs:84:19
4444
|
4545
LL | w(Wrapper(g()));
4646
| ^^^ function called here
@@ -50,7 +50,7 @@ LL | w(Wrapper(g()));
5050
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
5151

5252
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
53-
--> $DIR/simd-abi-checks.rs:75:9
53+
--> $DIR/simd-abi-checks.rs:84:9
5454
|
5555
LL | w(Wrapper(g()));
5656
| ^^^^^^^^^^^^^^^ function called here
@@ -59,8 +59,18 @@ LL | w(Wrapper(g()));
5959
= note: for more information, see issue #116558 <https://github.com/rust-lang/rust/issues/116558>
6060
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
6161

62+
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
63+
--> $DIR/simd-abi-checks.rs:100:9
64+
|
65+
LL | some_extern();
66+
| ^^^^^^^^^^^^^ function called here
67+
|
68+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
69+
= note: for more information, see issue #116558 <https://github.com/rust-lang/rust/issues/116558>
70+
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
71+
6272
warning: this function definition uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled
63-
--> $DIR/simd-abi-checks.rs:26:1
73+
--> $DIR/simd-abi-checks.rs:27:1
6474
|
6575
LL | unsafe extern "C" fn g() -> __m256 {
6676
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function defined here
@@ -70,7 +80,7 @@ LL | unsafe extern "C" fn g() -> __m256 {
7080
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
7181

7282
warning: this function definition uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled
73-
--> $DIR/simd-abi-checks.rs:20:1
83+
--> $DIR/simd-abi-checks.rs:21:1
7484
|
7585
LL | unsafe extern "C" fn f(_: __m256) {
7686
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function defined here
@@ -80,7 +90,7 @@ LL | unsafe extern "C" fn f(_: __m256) {
8090
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
8191

8292
warning: this function definition uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled
83-
--> $DIR/simd-abi-checks.rs:14:1
93+
--> $DIR/simd-abi-checks.rs:15:1
8494
|
8595
LL | unsafe extern "C" fn w(_: Wrapper) {
8696
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function defined here
@@ -89,11 +99,21 @@ LL | unsafe extern "C" fn w(_: Wrapper) {
8999
= note: for more information, see issue #116558 <https://github.com/rust-lang/rust/issues/116558>
90100
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
91101

92-
warning: 9 warnings emitted
102+
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
103+
--> $DIR/simd-abi-checks.rs:57:8
104+
|
105+
LL | || g()
106+
| ^^^ function called here
107+
|
108+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
109+
= note: for more information, see issue #116558 <https://github.com/rust-lang/rust/issues/116558>
110+
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
111+
112+
warning: 11 warnings emitted
93113

94114
Future incompatibility report: Future breakage diagnostic:
95115
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
96-
--> $DIR/simd-abi-checks.rs:55:11
116+
--> $DIR/simd-abi-checks.rs:64:11
97117
|
98118
LL | f(g());
99119
| ^^^ function called here
@@ -105,7 +125,7 @@ LL | f(g());
105125

106126
Future breakage diagnostic:
107127
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
108-
--> $DIR/simd-abi-checks.rs:55:9
128+
--> $DIR/simd-abi-checks.rs:64:9
109129
|
110130
LL | f(g());
111131
| ^^^^^^ function called here
@@ -117,7 +137,7 @@ LL | f(g());
117137

118138
Future breakage diagnostic:
119139
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
120-
--> $DIR/simd-abi-checks.rs:63:14
140+
--> $DIR/simd-abi-checks.rs:72:14
121141
|
122142
LL | gavx(favx());
123143
| ^^^^^^ function called here
@@ -129,7 +149,7 @@ LL | gavx(favx());
129149

130150
Future breakage diagnostic:
131151
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
132-
--> $DIR/simd-abi-checks.rs:63:9
152+
--> $DIR/simd-abi-checks.rs:72:9
133153
|
134154
LL | gavx(favx());
135155
| ^^^^^^^^^^^^ function called here
@@ -141,7 +161,7 @@ LL | gavx(favx());
141161

142162
Future breakage diagnostic:
143163
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
144-
--> $DIR/simd-abi-checks.rs:75:19
164+
--> $DIR/simd-abi-checks.rs:84:19
145165
|
146166
LL | w(Wrapper(g()));
147167
| ^^^ function called here
@@ -153,7 +173,7 @@ LL | w(Wrapper(g()));
153173

154174
Future breakage diagnostic:
155175
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
156-
--> $DIR/simd-abi-checks.rs:75:9
176+
--> $DIR/simd-abi-checks.rs:84:9
157177
|
158178
LL | w(Wrapper(g()));
159179
| ^^^^^^^^^^^^^^^ function called here
@@ -163,9 +183,21 @@ LL | w(Wrapper(g()));
163183
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
164184
= note: `#[warn(abi_unsupported_vector_types)]` on by default
165185

186+
Future breakage diagnostic:
187+
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
188+
--> $DIR/simd-abi-checks.rs:100:9
189+
|
190+
LL | some_extern();
191+
| ^^^^^^^^^^^^^ function called here
192+
|
193+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
194+
= note: for more information, see issue #116558 <https://github.com/rust-lang/rust/issues/116558>
195+
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
196+
= note: `#[warn(abi_unsupported_vector_types)]` on by default
197+
166198
Future breakage diagnostic:
167199
warning: this function definition uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled
168-
--> $DIR/simd-abi-checks.rs:26:1
200+
--> $DIR/simd-abi-checks.rs:27:1
169201
|
170202
LL | unsafe extern "C" fn g() -> __m256 {
171203
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function defined here
@@ -177,7 +209,7 @@ LL | unsafe extern "C" fn g() -> __m256 {
177209

178210
Future breakage diagnostic:
179211
warning: this function definition uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled
180-
--> $DIR/simd-abi-checks.rs:20:1
212+
--> $DIR/simd-abi-checks.rs:21:1
181213
|
182214
LL | unsafe extern "C" fn f(_: __m256) {
183215
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function defined here
@@ -189,7 +221,7 @@ LL | unsafe extern "C" fn f(_: __m256) {
189221

190222
Future breakage diagnostic:
191223
warning: this function definition uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled
192-
--> $DIR/simd-abi-checks.rs:14:1
224+
--> $DIR/simd-abi-checks.rs:15:1
193225
|
194226
LL | unsafe extern "C" fn w(_: Wrapper) {
195227
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function defined here
@@ -199,3 +231,15 @@ LL | unsafe extern "C" fn w(_: Wrapper) {
199231
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
200232
= note: `#[warn(abi_unsupported_vector_types)]` on by default
201233

234+
Future breakage diagnostic:
235+
warning: this function call uses a SIMD vector type that (with the chosen ABI) requires the `avx` target feature, which is not enabled in the caller
236+
--> $DIR/simd-abi-checks.rs:57:8
237+
|
238+
LL | || g()
239+
| ^^^ function called here
240+
|
241+
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
242+
= note: for more information, see issue #116558 <https://github.com/rust-lang/rust/issues/116558>
243+
= help: consider enabling it globally (`-C target-feature=+avx`) or locally (`#[target_feature(enable="avx")]`)
244+
= note: `#[warn(abi_unsupported_vector_types)]` on by default
245+

0 commit comments

Comments
 (0)