From eaf0a9027e8d5fad1cbbfbb551c17ceefdaadb0d Mon Sep 17 00:00:00 2001 From: sayantn Date: Wed, 4 Mar 2026 23:39:22 +0530 Subject: [PATCH] Use Intel SDE to test i686 too --- .github/workflows/main.yml | 4 ++++ ci/{docker/x86_64-unknown-linux-gnu => }/cpuid.def | 0 ci/docker/i686-unknown-linux-gnu/Dockerfile | 14 +++++++++++++- ci/docker/x86_64-unknown-linux-gnu/Dockerfile | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) rename ci/{docker/x86_64-unknown-linux-gnu => }/cpuid.def (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 98f6b842d1..a0256d39d8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -176,6 +176,10 @@ jobs: tuple: s390x-unknown-linux-gnu os: ubuntu-latest test_everything: true + - target: + tuple: i686-unknown-linux-gnu + os: ubuntu-latest + test_everything: true - target: tuple: x86_64-unknown-linux-gnu os: ubuntu-latest diff --git a/ci/docker/x86_64-unknown-linux-gnu/cpuid.def b/ci/cpuid.def similarity index 100% rename from ci/docker/x86_64-unknown-linux-gnu/cpuid.def rename to ci/cpuid.def diff --git a/ci/docker/i686-unknown-linux-gnu/Dockerfile b/ci/docker/i686-unknown-linux-gnu/Dockerfile index 49d5cecc71..daf990bed5 100644 --- a/ci/docker/i686-unknown-linux-gnu/Dockerfile +++ b/ci/docker/i686-unknown-linux-gnu/Dockerfile @@ -4,4 +4,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libc6-dev \ file \ make \ - ca-certificates + ca-certificates \ + wget \ + xz-utils + +RUN wget http://ci-mirrors.rust-lang.org/stdarch/sde-external-10.5.0-2026-01-13-lin.tar.xz -O sde.tar.xz +RUN mkdir intel-sde +RUN tar -xJf sde.tar.xz --strip-components=1 -C intel-sde +ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_RUNNER="/intel-sde/sde \ + -cpuid-in /checkout/ci/cpuid.def \ + -rtm-mode full -tsx --" +# SDE doesn't support AMD extensions +# FIXME: find a way to test these +ENV STDARCH_TEST_SKIP_FEATURE="sse4a,tbm,xop" diff --git a/ci/docker/x86_64-unknown-linux-gnu/Dockerfile b/ci/docker/x86_64-unknown-linux-gnu/Dockerfile index efbb2b0853..81b780ff84 100644 --- a/ci/docker/x86_64-unknown-linux-gnu/Dockerfile +++ b/ci/docker/x86_64-unknown-linux-gnu/Dockerfile @@ -31,7 +31,7 @@ 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 \ + -cpuid-in /checkout/ci/cpuid.def \ -rtm-mode full -tsx --" # SDE doesn't support AMD extensions # FIXME: find a way to test these