Skip to content

Commit 82e8d6a

Browse files
committed
Auto merge of #149118 - folkertdev:stdarch-sync-2025-11-19, r=tgross35
stdarch subtree update Subtree update of `stdarch` to rust-lang/stdarch@50134e1. Created using https://github.com/rust-lang/josh-sync. The only interesting commit is the final one, which enables the `avx10_target_feature` feature in the standard library, because it is now used in `stdarch`. r? `@sayantn` (or whoever, this is just a straightforward sync)
2 parents d2f8873 + ae682a3 commit 82e8d6a

File tree

29 files changed

+1030
-691
lines changed

29 files changed

+1030
-691
lines changed

library/core/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@
195195
// tidy-alphabetical-start
196196
#![feature(aarch64_unstable_target_feature)]
197197
#![feature(arm_target_feature)]
198+
#![feature(avx10_target_feature)]
198199
#![feature(hexagon_target_feature)]
199200
#![feature(loongarch_target_feature)]
200201
#![feature(mips_target_feature)]

library/stdarch/.github/workflows/rustc-pull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# https://rust-lang.zulipchat.com/#narrow/channel/208962-t-libs.2Fstdarch/topic/Subtree.20sync.20automation/with/528461782
1717
zulip-stream-id: 208962
1818
zulip-bot-email: "stdarch-ci-bot@rust-lang.zulipchat.com"
19-
pr-base-branch: master
19+
pr-base-branch: main
2020
branch-name: rustc-pull
2121
secrets:
2222
zulip-api-token: ${{ secrets.ZULIP_API_TOKEN }}

library/stdarch/ci/docker/aarch64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515

1616
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
1717
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -cpu max -L /usr/aarch64-linux-gnu" \
18-
OBJDUMP=aarch64-linux-gnu-objdump \
19-
STDARCH_TEST_SKIP_FEATURE=tme
18+
OBJDUMP=aarch64-linux-gnu-objdump

library/stdarch/ci/docker/aarch64_be-unknown-linux-gnu/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ ENV AARCH64_BE_LIBC="${AARCH64_BE_TOOLCHAIN}/aarch64_be-none-linux-gnu/libc"
2727
ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_LINKER="${AARCH64_BE_TOOLCHAIN}/bin/aarch64_be-none-linux-gnu-gcc"
2828
ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64_be -cpu max -L ${AARCH64_BE_LIBC}"
2929
ENV OBJDUMP="${AARCH64_BE_TOOLCHAIN}/bin/aarch64_be-none-linux-gnu-objdump"
30-
ENV STDARCH_TEST_SKIP_FEATURE=tme

library/stdarch/ci/intrinsic-test-docker.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ run() {
3636
--env NORUN \
3737
--env RUSTFLAGS \
3838
--env CARGO_UNSTABLE_BUILD_STD \
39+
--env TEST_SAMPLE_INTRINSICS_PERCENTAGE \
3940
--volume "${HOME}/.cargo":/cargo \
4041
--volume "$(rustc --print sysroot)":/rust:ro \
4142
--volume "$(pwd)":/checkout:ro \

library/stdarch/ci/intrinsic-test.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,28 +51,31 @@ case ${TARGET} in
5151
TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_aarch64.txt
5252
TEST_CXX_COMPILER="clang++"
5353
TEST_RUNNER="${CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER}"
54+
: "${TEST_SAMPLE_INTRINSICS_PERCENTAGE:=100}"
5455
;;
5556

5657
aarch64_be-unknown-linux-gnu*)
5758
TEST_CPPFLAGS="-fuse-ld=lld"
5859
TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_aarch64.txt
5960
TEST_CXX_COMPILER="clang++"
6061
TEST_RUNNER="${CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_RUNNER}"
62+
: "${TEST_SAMPLE_INTRINSICS_PERCENTAGE:=100}"
6163
;;
6264

6365
armv7-unknown-linux-gnueabihf*)
6466
TEST_CPPFLAGS="-fuse-ld=lld -I/usr/arm-linux-gnueabihf/include/ -I/usr/arm-linux-gnueabihf/include/c++/9/arm-linux-gnueabihf/"
6567
TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_arm.txt
6668
TEST_CXX_COMPILER="clang++"
6769
TEST_RUNNER="${CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER}"
70+
: "${TEST_SAMPLE_INTRINSICS_PERCENTAGE:=100}"
6871
;;
6972

7073
x86_64-unknown-linux-gnu*)
7174
TEST_CPPFLAGS="-fuse-ld=lld -I/usr/include/x86_64-linux-gnu/"
7275
TEST_CXX_COMPILER="clang++"
7376
TEST_RUNNER="${CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER}"
7477
TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_x86.txt
75-
TEST_SAMPLE_INTRINSICS_PERCENTAGE=5
78+
: "${TEST_SAMPLE_INTRINSICS_PERCENTAGE:=5}"
7679
;;
7780
*)
7881
;;
@@ -82,23 +85,25 @@ esac
8285
# Arm specific
8386
case "${TARGET}" in
8487
aarch64-unknown-linux-gnu*|armv7-unknown-linux-gnueabihf*)
85-
CPPFLAGS="${TEST_CPPFLAGS}" RUSTFLAGS="${HOST_RUSTFLAGS}" RUST_LOG=warn \
88+
CPPFLAGS="${TEST_CPPFLAGS}" RUSTFLAGS="${HOST_RUSTFLAGS}" RUST_LOG=info \
8689
cargo run "${INTRINSIC_TEST}" "${PROFILE}" \
8790
--bin intrinsic-test -- intrinsics_data/arm_intrinsics.json \
8891
--runner "${TEST_RUNNER}" \
8992
--cppcompiler "${TEST_CXX_COMPILER}" \
9093
--skip "${TEST_SKIP_INTRINSICS}" \
91-
--target "${TARGET}"
94+
--target "${TARGET}" \
95+
--sample-percentage "${TEST_SAMPLE_INTRINSICS_PERCENTAGE}"
9296
;;
9397

9498
aarch64_be-unknown-linux-gnu*)
95-
CPPFLAGS="${TEST_CPPFLAGS}" RUSTFLAGS="${HOST_RUSTFLAGS}" RUST_LOG=warn \
99+
CPPFLAGS="${TEST_CPPFLAGS}" RUSTFLAGS="${HOST_RUSTFLAGS}" RUST_LOG=info \
96100
cargo run "${INTRINSIC_TEST}" "${PROFILE}" \
97101
--bin intrinsic-test -- intrinsics_data/arm_intrinsics.json \
98102
--runner "${TEST_RUNNER}" \
99103
--cppcompiler "${TEST_CXX_COMPILER}" \
100104
--skip "${TEST_SKIP_INTRINSICS}" \
101105
--target "${TARGET}" \
106+
--sample-percentage "${TEST_SAMPLE_INTRINSICS_PERCENTAGE}" \
102107
--linker "${CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_LINKER}" \
103108
--cxx-toolchain-dir "${AARCH64_BE_TOOLCHAIN}"
104109
;;
@@ -109,7 +114,7 @@ case "${TARGET}" in
109114
# Hence the use of `env -u`.
110115
env -u CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER \
111116
CPPFLAGS="${TEST_CPPFLAGS}" RUSTFLAGS="${HOST_RUSTFLAGS}" \
112-
RUST_LOG=warn RUST_BACKTRACE=1 \
117+
RUST_LOG=info RUST_BACKTRACE=1 \
113118
cargo run "${INTRINSIC_TEST}" "${PROFILE}" \
114119
--bin intrinsic-test -- intrinsics_data/x86-intel.xml \
115120
--runner "${TEST_RUNNER}" \

library/stdarch/crates/core_arch/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
The `core::arch` module implements architecture-dependent intrinsics (e.g. SIMD).
55

6-
# Usage
6+
# Usage
77

88
`core::arch` is available as part of `libcore` and it is re-exported by
99
`libstd`. Prefer using it via `core::arch` or `std::arch` than via this crate.
@@ -17,7 +17,7 @@ are:
1717
you need to re-compile it for a non-standard target, please prefer using
1818
`xargo` and re-compiling `libcore`/`libstd` as appropriate instead of using
1919
this crate.
20-
20+
2121
* using some features that might not be available even behind unstable Rust
2222
features. We try to keep these to a minimum. If you need to use some of these
2323
features, please open an issue so that we can expose them in nightly Rust and
@@ -34,7 +34,7 @@ are:
3434
* [How to get started][contrib]
3535
* [How to help implement intrinsics][help-implement]
3636

37-
[contrib]: https://github.com/rust-lang/stdarch/blob/master/CONTRIBUTING.md
37+
[contrib]: https://github.com/rust-lang/stdarch/blob/HEAD/CONTRIBUTING.md
3838
[help-implement]: https://github.com/rust-lang/stdarch/issues/40
3939
[i686]: https://rust-lang.github.io/stdarch/i686/core_arch/
4040
[x86_64]: https://rust-lang.github.io/stdarch/x86_64/core_arch/

library/stdarch/crates/core_arch/src/aarch64/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ mod neon;
2121
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
2222
pub use self::neon::*;
2323

24-
mod tme;
25-
#[unstable(feature = "stdarch_aarch64_tme", issue = "117216")]
26-
pub use self::tme::*;
27-
2824
mod prefetch;
2925
#[unstable(feature = "stdarch_aarch64_prefetch", issue = "117217")]
3026
pub use self::prefetch::*;

library/stdarch/crates/core_arch/src/aarch64/tme.rs

Lines changed: 0 additions & 201 deletions
This file was deleted.

library/stdarch/crates/core_arch/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
f16,
3434
aarch64_unstable_target_feature,
3535
bigint_helper_methods,
36-
funnel_shifts
36+
funnel_shifts,
37+
avx10_target_feature
3738
)]
3839
#![cfg_attr(test, feature(test, abi_vectorcall, stdarch_internal))]
3940
#![deny(clippy::missing_inline_in_public_items)]

0 commit comments

Comments
 (0)