Auto merge of #156900 - folkertdev:stdarch-sync-2026-05-25, r=folkertdev

stdarch subtree update

Subtree update of `stdarch` to rust-lang/stdarch@5e930b6.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

Author: bors

library/stdarch/.github/workflows/main.yml

@@ -281,10 +281,19 @@ jobs:
           - armv7-unknown-linux-gnueabihf
           - x86_64-unknown-linux-gnu
         profile: [dev, release]
+        cc: [clang, gcc]
         include:
           - target: aarch64_be-unknown-linux-gnu
             build_std: true
-
+          - target: x86_64-unknown-linux-gnu
+            cc: icx
+            profile: dev
+          - target: x86_64-unknown-linux-gnu
+            cc: icx
+            profile: release
+        exclude:
+          - target: armv7-unknown-linux-gnueabihf
+            cc: gcc
     steps:
     - uses: actions/checkout@v6
     - name: Install Rust
@@ -297,18 +306,19 @@ jobs:
         rustup component add rust-src
         echo "CARGO_UNSTABLE_BUILD_STD=std" >> $GITHUB_ENV
       if: ${{ matrix.build_std }}
+    - run: rustup component add rustfmt
 
     # Configure some env vars based on matrix configuration
     - run: echo "PROFILE=${{ matrix.profile }}" >> $GITHUB_ENV
-    - run: ./ci/intrinsic-test-docker.sh ${{ matrix.target }}
+    - run: ./ci/intrinsic-test-docker.sh ${{ matrix.target }} ${{ matrix.cc }}
       if: ${{ !startsWith(matrix.target, 'thumb') }}
       env:
         TARGET: ${{ matrix.target }}
 
   # Check that the generated files agree with the checked-in versions.
   check-stdarch-gen:
     needs: [style]
-    name: Check stdarch-gen-{arm, loongarch, hexagon} output
+    name: Check stdarch-gen-{arm, loongarch, hexagon, hexagon-scalar} output
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v6
@@ -330,6 +340,10 @@ jobs:
       run: |
         cargo run -p stdarch-gen-hexagon --release
         git diff --exit-code
+    - name: Check hexagon scalar
+      run: |
+        cargo run -p stdarch-gen-hexagon-scalar --release
+        git diff --exit-code
 
   # Run some tests with Miri. Most stdarch functions use platform-specific intrinsics
   # that Miri does not support. Also Miri is reltively slow.

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

@@ -15,7 +15,8 @@ RUN wget https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-22.1.4-x86_64
 RUN mkdir llvm
 RUN tar -xvf llvm.tar.xz --strip-components=1 -C llvm
 
-ENV PATH="/llvm/bin:$PATH"
+ENV CLANG_PATH="/llvm/bin/clang"
+ENV GCC_PATH=aarch64-linux-gnu-gcc
 
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
     CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -cpu max -L /usr/aarch64-linux-gnu" \

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

@@ -23,11 +23,12 @@ RUN wget https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-22.1.4-x86_64
 RUN mkdir llvm
 RUN tar -xvf llvm.tar.xz --strip-components=1 -C llvm
 
-ENV PATH="/llvm/bin:$PATH"
-
 ENV AARCH64_BE_TOOLCHAIN="/toolchains/${TOOLCHAIN}"
 ENV AARCH64_BE_LIBC="${AARCH64_BE_TOOLCHAIN}/aarch64_be-none-linux-gnu/libc"
 
+ENV CLANG_PATH="/llvm/bin/clang"
+ENV GCC_PATH="${AARCH64_BE_TOOLCHAIN}/bin/aarch64_be-none-linux-gnu-gcc"
+
 ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_LINKER="${AARCH64_BE_TOOLCHAIN}/bin/aarch64_be-none-linux-gnu-gcc"
 ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64_be -cpu max -L ${AARCH64_BE_LIBC}"
 ENV OBJDUMP="${AARCH64_BE_TOOLCHAIN}/bin/aarch64_be-none-linux-gnu-objdump"

library/stdarch/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile

@@ -14,7 +14,8 @@ RUN wget https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-22.1.4-x86_64
 RUN mkdir llvm
 RUN tar -xvf llvm.tar.xz --strip-components=1 -C llvm
 
-ENV PATH="/llvm/bin:$PATH"
+ENV CLANG_PATH="/llvm/bin/clang"
+ENV GCC_PATH=arm-linux-gnueabihf-gcc
 
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -cpu max -L /usr/arm-linux-gnueabihf" \

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

@@ -6,7 +6,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   make \
   ca-certificates \
   wget \
-  xz-utils
+  xz-utils \
+  gpg
 
 RUN wget http://ci-mirrors.rust-lang.org/sde-external-10.8.0-2026-03-15-lin.tar.xz -O sde.tar.xz
 RUN mkdir intel-sde
@@ -16,7 +17,18 @@ RUN wget https://mirrors.edge.kernel.org/pub/tools/llvm/files/llvm-22.1.4-x86_64
 RUN mkdir llvm
 RUN tar -xvf llvm.tar.xz --strip-components=1 -C llvm
 
-ENV PATH="/llvm/bin:$PATH"
+RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB |\
+    gpg --dearmor |\
+    tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
+
+RUN echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" |\
+    tee /etc/apt/sources.list.d/oneAPI.list
+
+RUN apt-get update && apt-get install -y --no-install-recommends intel-oneapi-compiler-dpcpp-cpp
+
+ENV CLANG_PATH="/llvm/bin/clang"
+ENV GCC_PATH="gcc"
+ENV ICX_PATH="/opt/intel/oneapi/compiler/2026.0/bin/icx"
 
 ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/intel-sde/sde64 \
             -cpuid-in /checkout/ci/docker/x86_64-unknown-linux-gnu/cpuid.def \

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

@@ -5,8 +5,8 @@
 
 set -ex
 
-if [ $# -lt 1 ]; then
-    >&2 echo "Usage: $0 <TARGET>"
+if [ $# -lt 2 ]; then
+    >&2 echo "Usage: $0 <TARGET> <CC>"
     exit 1
 fi
 
@@ -29,7 +29,6 @@ run() {
       --user "$(id -u)":"$(id -g)" \
       --env CARGO_HOME=/cargo \
       --env CARGO_TARGET_DIR=/checkout/target \
-      --env TARGET="${1}" \
       --env PROFILE \
       --env "${HOST_LINKER}"="cc" \
       --env STDARCH_DISABLE_ASSERT_INSTR \
@@ -48,12 +47,12 @@ run() {
       --workdir /checkout \
       --privileged \
       stdarch \
-      sh -c "HOME=/tmp PATH=\$PATH:/rust/bin exec ci/intrinsic-test.sh"
+      sh -c "HOME=/tmp PATH=\$PATH:/rust/bin exec ci/intrinsic-test.sh ${1} ${2}"
 }
 
 if [ -z "$1" ]; then
   >&2 echo "No target specified!"
   exit 1
 else
-  run "${1}"
+  run "${1}" "${2}"
 fi

library/stdarch/ci/intrinsic-test.sh

@@ -2,7 +2,30 @@
 
 set -ex
 
-: "${TARGET?The TARGET environment variable must be set.}"
+if [ $# -lt 2 ]; then
+    >&2 echo "Usage: $0 <TARGET> <CC>"
+    exit 1
+fi
+
+case ${2} in
+    clang)
+        export CC="${CLANG_PATH}"
+        CC_ARG_STYLE=clang
+        ;;
+    gcc)
+        export CC="${GCC_PATH}"
+        CC_ARG_STYLE=gcc
+        ;;
+    icx)
+        export CC="${ICX_PATH}"
+        # `icx` uses clang-style arguments
+        CC_ARG_STYLE=clang
+        ;;
+    *)
+        >&2 echo "Unknown compiler: ${2}"
+        exit 1
+        ;;
+esac
 
 export RUSTFLAGS="${RUSTFLAGS} -D warnings -Z merge-functions=disabled -Z verify-llvm-ir"
 export PROFILE="${PROFILE:="release"}"
@@ -12,49 +35,49 @@ echo "PROFILE=${PROFILE}"
 
 INTRINSIC_TEST="--manifest-path=crates/intrinsic-test/Cargo.toml"
 
-export CC="clang"
-
-case ${TARGET} in
+case ${1} in
     aarch64_be*)
         export CFLAGS="-I${AARCH64_BE_TOOLCHAIN}/aarch64_be-none-linux-gnu/libc/usr/include --sysroot={AARCH64_BE_TOOLCHAIN}/aarch64_be-none-linux-gnu/libc -Wno-nonportable-vector-initialization"
-        TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_aarch64_be.txt
+        ARCH=aarch64_be
         ;;
 
     aarch64*)
         export CFLAGS="-I/usr/aarch64-linux-gnu/include/"
-        TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_aarch64.txt
+        ARCH=aarch64
         ;;
 
     armv7*)
         export CFLAGS="-I/usr/arm-linux-gnueabihf/include/"
-        TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_arm.txt
+        ARCH=arm
         ;;
 
     x86_64*)
         export CFLAGS="-I/usr/include/x86_64-linux-gnu/"
-        TEST_SKIP_INTRINSICS=crates/intrinsic-test/missing_x86.txt
+        ARCH=x86
         ;;
     *)
         ;;
 
 esac
 
-case "${TARGET}" in
+case "${1}" in
     x86_64-unknown-linux-gnu*)
         env -u CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER \
             cargo run "${INTRINSIC_TEST}" --release \
             --bin intrinsic-test -- intrinsics_data/x86-intel.xml \
-            --skip "${TEST_SKIP_INTRINSICS}" \
-            --target "${TARGET}"
-
-        echo "${CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER}"
+            --skip "crates/intrinsic-test/missing_${ARCH}_common.txt" \
+            --skip "crates/intrinsic-test/missing_${ARCH}_${2}.txt" \
+            --target "${1}" \
+            --cc-arg-style "${CC_ARG_STYLE}"
         ;;
     *)
         cargo run "${INTRINSIC_TEST}" --release \
             --bin intrinsic-test -- intrinsics_data/arm_intrinsics.json \
-            --skip "${TEST_SKIP_INTRINSICS}" \
-            --target "${TARGET}"
+            --skip "crates/intrinsic-test/missing_${ARCH}_common.txt" \
+            --skip "crates/intrinsic-test/missing_${ARCH}_${2}.txt" \
+            --target "${1}" \
+            --cc-arg-style "${CC_ARG_STYLE}"
         ;;
 esac
 
-cargo test --manifest-path=rust_programs/Cargo.toml --target "${TARGET}" --profile "${PROFILE}"
+cargo test --manifest-path=rust_programs/Cargo.toml --target "${1}" --profile "${PROFILE}" --tests