Skip to content

Commit

Permalink
Auto merge of rust-lang#134333 - daxpedda:stdarch-bump, r=daxpedda
Browse files Browse the repository at this point in the history
Bump `stdarch`

This bumps `stdarch` to rust-lang/stdarch@684de0d to get in rust-lang/stdarch#1677 (tracked in rust-lang#133908).

From the [commit history](rust-lang/stdarch@e5e00aa...684de0d) I deduced that there shouldn't be any changes to Rust necessary.

From past PRs I'm assuming that bumping `stdarch` like this is fine, but please let me know if this is somehow inappropriate or requires something more to be done!

try-job: arm-android
try-job: armhf-gnu
  • Loading branch information
bors committed Dec 24, 2024
2 parents d53b0ff + 374800b commit 409998c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 19 deletions.
13 changes: 2 additions & 11 deletions library/portable-simd/crates/core_simd/src/vendor/arm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,6 @@ mod neon {
from_transmute! { unsafe u64x2 => poly64x2_t }
}

#[cfg(any(
all(target_feature = "v5te", not(target_feature = "mclass")),
all(target_feature = "mclass", target_feature = "dsp"),
))]
mod dsp {
use super::*;

from_transmute! { unsafe Simd<u16, 2> => uint16x2_t }
from_transmute! { unsafe Simd<i16, 2> => int16x2_t }
}

#[cfg(any(
all(target_feature = "v6", not(target_feature = "mclass")),
all(target_feature = "mclass", target_feature = "dsp"),
Expand All @@ -68,6 +57,8 @@ mod simd32 {

from_transmute! { unsafe Simd<u8, 4> => uint8x4_t }
from_transmute! { unsafe Simd<i8, 4> => int8x4_t }
from_transmute! { unsafe Simd<u16, 2> => uint16x2_t }
from_transmute! { unsafe Simd<i16, 2> => int16x2_t }
}

#[cfg(all(
Expand Down
2 changes: 1 addition & 1 deletion library/stdarch
Submodule stdarch updated 47 files
+21 −27 .github/workflows/main.yml
+2 −2 CONTRIBUTING.md
+2 −2 ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
+2 −2 ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
+3 −3 ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile
+3 −3 ci/docker/x86_64-unknown-linux-gnu-emulated/cpuid.def
+25 −36 ci/dox.sh
+0 −34 ci/gba.json
+3 −11 ci/run.sh
+24 −35 crates/core_arch/src/arm/dsp.rs
+19 −8 crates/core_arch/src/arm/simd32.rs
+1 −2 crates/core_arch/src/lib.rs
+136 −19 crates/core_arch/src/riscv_shared/p.rs
+3 −0 crates/core_arch/src/simd.rs
+142 −0 crates/core_arch/src/wasm32/mod.rs
+28 −7 crates/core_arch/src/wasm32/simd128.rs
+13 −17 crates/core_arch/src/x86/avx.rs
+39 −52 crates/core_arch/src/x86/avx2.rs
+13 −23 crates/core_arch/src/x86/avx512bf16.rs
+33 −15 crates/core_arch/src/x86/avx512bitalg.rs
+280 −536 crates/core_arch/src/x86/avx512bw.rs
+12 −24 crates/core_arch/src/x86/avx512cd.rs
+64 −128 crates/core_arch/src/x86/avx512dq.rs
+929 −1,928 crates/core_arch/src/x86/avx512f.rs
+27 −30 crates/core_arch/src/x86/avx512fp16.rs
+9 −18 crates/core_arch/src/x86/avx512vbmi.rs
+48 −132 crates/core_arch/src/x86/avx512vbmi2.rs
+12 −24 crates/core_arch/src/x86/avx512vnni.rs
+31 −15 crates/core_arch/src/x86/avx512vpopcntdq.rs
+2 −2 crates/core_arch/src/x86/avxneconvert.rs
+0 −25 crates/core_arch/src/x86/fxsr.rs
+9 −12 crates/core_arch/src/x86/gfni.rs
+3 −3 crates/core_arch/src/x86/sse.rs
+13 −16 crates/core_arch/src/x86/sse2.rs
+4 −4 crates/core_arch/src/x86/sse41.rs
+5 −5 crates/core_arch/src/x86/ssse3.rs
+0 −17 crates/core_arch/src/x86/xsave.rs
+27 −0 crates/core_arch/src/x86_64/amx.rs
+4 −1 crates/core_arch/src/x86_64/avx512f.rs
+0 −25 crates/core_arch/src/x86_64/fxsr.rs
+0 −17 crates/core_arch/src/x86_64/xsave.rs
+3 −4 crates/std_detect/src/detect/macros.rs
+3 −3 crates/stdarch-test/src/disassembly.rs
+6 −1 crates/stdarch-test/src/lib.rs
+39 −16 crates/stdarch-verify/tests/x86-intel.rs
+8 −22 examples/connect5.rs
+2 −10 examples/hex.rs
1 change: 1 addition & 0 deletions tests/ui/traits/issue-77982.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//@ ignore-windows different list of satisfying impls
//@ ignore-arm different list of satisfying impls
use std::collections::HashMap;

fn what() {
Expand Down
14 changes: 7 additions & 7 deletions tests/ui/traits/issue-77982.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0283]: type annotations needed
--> $DIR/issue-77982.rs:9:10
--> $DIR/issue-77982.rs:10:10
|
LL | opts.get(opt.as_ref());
| ^^^ ------------ type must be known at this point
Expand All @@ -18,7 +18,7 @@ LL | opts.get::<Q>(opt.as_ref());
| +++++

error[E0283]: type annotations needed
--> $DIR/issue-77982.rs:9:10
--> $DIR/issue-77982.rs:10:10
|
LL | opts.get(opt.as_ref());
| ^^^ ------ type must be known at this point
Expand All @@ -36,7 +36,7 @@ LL | opts.get::<Q>(opt.as_ref());
| +++++

error[E0283]: type annotations needed
--> $DIR/issue-77982.rs:14:59
--> $DIR/issue-77982.rs:15:59
|
LL | let ips: Vec<_> = (0..100_000).map(|_| u32::from(0u32.into())).collect();
| --- ^^^^
Expand All @@ -56,13 +56,13 @@ LL | let ips: Vec<_> = (0..100_000).map(|_| u32::from(<u32 as Into<T>>::into
| +++++++++++++++++++++++ ~

error[E0283]: type annotations needed for `Box<_>`
--> $DIR/issue-77982.rs:37:9
--> $DIR/issue-77982.rs:38:9
|
LL | let _ = ().foo();
| ^ --- type must be known at this point
|
note: multiple `impl`s satisfying `(): Foo<'_, _>` found
--> $DIR/issue-77982.rs:30:1
--> $DIR/issue-77982.rs:31:1
|
LL | impl Foo<'static, u32> for () {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -74,13 +74,13 @@ LL | let _: Box<T> = ().foo();
| ++++++++

error[E0283]: type annotations needed for `Box<_>`
--> $DIR/issue-77982.rs:41:9
--> $DIR/issue-77982.rs:42:9
|
LL | let _ = (&()).bar();
| ^ --- type must be known at this point
|
note: multiple `impl`s satisfying `&(): Bar<'_, _>` found
--> $DIR/issue-77982.rs:33:1
--> $DIR/issue-77982.rs:34:1
|
LL | impl<'a> Bar<'static, u32> for &'a () {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 409998c

Please sign in to comment.