diff options
| author | sayantn <sayantn05@gmail.com> | 2025-04-16 03:06:15 +0530 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2025-04-20 21:39:39 +0000 |
| commit | bc9e29d9be2601e406a03bb6749a051c4ecab01e (patch) | |
| tree | f7a050b7f1ecb164f1dc482bc0fae0f4ec080596 /library/stdarch | |
| parent | b3a7ba4607cde26f8bb817d92755fc4cb86d40e8 (diff) | |
| download | rust-bc9e29d9be2601e406a03bb6749a051c4ecab01e.tar.gz rust-bc9e29d9be2601e406a03bb6749a051c4ecab01e.zip | |
Replace `cfg(stdarch_intel_sde)` with `STDARCH_TEST_SKIP_FUNCTION`
Diffstat (limited to 'library/stdarch')
5 files changed, 2 insertions, 11 deletions
diff --git a/library/stdarch/.github/workflows/main.yml b/library/stdarch/.github/workflows/main.yml index 91eeade82a5..8a9bf04be55 100644 --- a/library/stdarch/.github/workflows/main.yml +++ b/library/stdarch/.github/workflows/main.yml @@ -126,7 +126,6 @@ jobs: tuple: x86_64-unknown-linux-gnu-emulated os: ubuntu-latest test_everything: true - rustflags: --cfg stdarch_intel_sde # MIPS targets disabled since they are dropped to tier 3. # See https://github.com/rust-lang/compiler-team/issues/648 #- target: @@ -191,9 +190,6 @@ jobs: - run: echo "STDARCH_TEST_EVERYTHING=1" >> $GITHUB_ENV shell: bash if: matrix.test_everything != '' - - run: echo "RUSTFLAGS=${{ matrix.rustflags }}" >> $GITHUB_ENV - shell: bash - if: matrix.rustflags != '' - run: echo "STDARCH_DISABLE_ASSERT_INSTR=1" >> $GITHUB_ENV shell: bash if: matrix.disable_assert_instr != '' diff --git a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile b/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile index 4d673eb7cbf..9409628f1e4 100644 --- a/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile +++ b/library/stdarch/ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile @@ -14,3 +14,5 @@ RUN tar -xJf sde.tar.xz --strip-components=1 -C intel-sde ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/intel-sde/sde64 \ -cpuid-in /checkout/ci/docker/x86_64-unknown-linux-gnu-emulated/cpuid.def \ -rtm-mode full -tsx --" +# These tests fail with SDE as it doesn't support saving register data +ENV STDARCH_TEST_SKIP_FUNCTION="xsave,xsaveopt,xsave64,xsaveopt64" diff --git a/library/stdarch/crates/core_arch/Cargo.toml b/library/stdarch/crates/core_arch/Cargo.toml index 296abc9ecf8..f4bd5fc552a 100644 --- a/library/stdarch/crates/core_arch/Cargo.toml +++ b/library/stdarch/crates/core_arch/Cargo.toml @@ -27,9 +27,6 @@ std_detect = { version = "0.*", path = "../std_detect" } [target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'.dev-dependencies] syscalls = { version = "0.6.18", default-features = false } -[lints.rust] -unexpected_cfgs = {level = "warn", check-cfg = ['cfg(stdarch_intel_sde)'] } - [lints.clippy] too_long_first_doc_paragraph = "allow" missing_transmute_annotations = "allow" diff --git a/library/stdarch/crates/core_arch/src/x86/xsave.rs b/library/stdarch/crates/core_arch/src/x86/xsave.rs index b5dc73c0681..10266662e13 100644 --- a/library/stdarch/crates/core_arch/src/x86/xsave.rs +++ b/library/stdarch/crates/core_arch/src/x86/xsave.rs @@ -185,7 +185,6 @@ mod tests { } } - #[cfg_attr(stdarch_intel_sde, ignore)] #[simd_test(enable = "xsave")] #[cfg_attr(miri, ignore)] // Register saving/restoring is not supported in Miri unsafe fn test_xsave() { @@ -208,7 +207,6 @@ mod tests { assert_eq!(xcr, xcr_cpy); } - #[cfg_attr(stdarch_intel_sde, ignore)] #[simd_test(enable = "xsave,xsaveopt")] #[cfg_attr(miri, ignore)] // Register saving/restoring is not supported in Miri unsafe fn test_xsaveopt() { diff --git a/library/stdarch/crates/core_arch/src/x86_64/xsave.rs b/library/stdarch/crates/core_arch/src/x86_64/xsave.rs index d8e72969ed1..ca2367307f8 100644 --- a/library/stdarch/crates/core_arch/src/x86_64/xsave.rs +++ b/library/stdarch/crates/core_arch/src/x86_64/xsave.rs @@ -149,7 +149,6 @@ mod tests { } } - #[cfg_attr(stdarch_intel_sde, ignore)] #[simd_test(enable = "xsave")] #[cfg_attr(miri, ignore)] // Register saving/restoring is not supported in Miri unsafe fn test_xsave64() { @@ -162,7 +161,6 @@ mod tests { xsave::_xsave64(b.ptr(), m); } - #[cfg_attr(stdarch_intel_sde, ignore)] #[simd_test(enable = "xsave,xsaveopt")] #[cfg_attr(miri, ignore)] // Register saving/restoring is not supported in Miri unsafe fn test_xsaveopt64() { |