Skip to content

Commit 9f7e42f

Browse files
committed
Replace cfg(stdarch_intel_sde) with STDARCH_TEST_SKIP_FUNCTION
1 parent 76e9f77 commit 9f7e42f

File tree

5 files changed

+1
-11
lines changed

5 files changed

+1
-11
lines changed

.github/workflows/main.yml

-4
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ jobs:
126126
tuple: x86_64-unknown-linux-gnu-emulated
127127
os: ubuntu-latest
128128
test_everything: true
129-
rustflags: --cfg stdarch_intel_sde
130129
# MIPS targets disabled since they are dropped to tier 3.
131130
# See https://github.com/rust-lang/compiler-team/issues/648
132131
#- target:
@@ -191,9 +190,6 @@ jobs:
191190
- run: echo "STDARCH_TEST_EVERYTHING=1" >> $GITHUB_ENV
192191
shell: bash
193192
if: matrix.test_everything != ''
194-
- run: echo "RUSTFLAGS=${{ matrix.rustflags }}" >> $GITHUB_ENV
195-
shell: bash
196-
if: matrix.rustflags != ''
197193
- run: echo "STDARCH_DISABLE_ASSERT_INSTR=1" >> $GITHUB_ENV
198194
shell: bash
199195
if: matrix.disable_assert_instr != ''

ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ RUN tar -xJf sde.tar.xz --strip-components=1 -C intel-sde
1414
ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/intel-sde/sde64 \
1515
-cpuid-in /checkout/ci/docker/x86_64-unknown-linux-gnu-emulated/cpuid.def \
1616
-rtm-mode full -tsx --"
17+
ENV STDARCH_TEST_SKIP_FUNCTION="xsave,xsaveopt,xsave64,xsaveopt64"

crates/core_arch/Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ std_detect = { version = "0.*", path = "../std_detect" }
2727
[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'.dev-dependencies]
2828
syscalls = { version = "0.6.18", default-features = false }
2929

30-
[lints.rust]
31-
unexpected_cfgs = {level = "warn", check-cfg = ['cfg(stdarch_intel_sde)'] }
32-
3330
[lints.clippy]
3431
too_long_first_doc_paragraph = "allow"
3532
missing_transmute_annotations = "allow"

crates/core_arch/src/x86/xsave.rs

-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ mod tests {
185185
}
186186
}
187187

188-
#[cfg_attr(stdarch_intel_sde, ignore)]
189188
#[simd_test(enable = "xsave")]
190189
#[cfg_attr(miri, ignore)] // Register saving/restoring is not supported in Miri
191190
unsafe fn test_xsave() {
@@ -208,7 +207,6 @@ mod tests {
208207
assert_eq!(xcr, xcr_cpy);
209208
}
210209

211-
#[cfg_attr(stdarch_intel_sde, ignore)]
212210
#[simd_test(enable = "xsave,xsaveopt")]
213211
#[cfg_attr(miri, ignore)] // Register saving/restoring is not supported in Miri
214212
unsafe fn test_xsaveopt() {

crates/core_arch/src/x86_64/xsave.rs

-2
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ mod tests {
149149
}
150150
}
151151

152-
#[cfg_attr(stdarch_intel_sde, ignore)]
153152
#[simd_test(enable = "xsave")]
154153
#[cfg_attr(miri, ignore)] // Register saving/restoring is not supported in Miri
155154
unsafe fn test_xsave64() {
@@ -162,7 +161,6 @@ mod tests {
162161
xsave::_xsave64(b.ptr(), m);
163162
}
164163

165-
#[cfg_attr(stdarch_intel_sde, ignore)]
166164
#[simd_test(enable = "xsave,xsaveopt")]
167165
#[cfg_attr(miri, ignore)] // Register saving/restoring is not supported in Miri
168166
unsafe fn test_xsaveopt64() {

0 commit comments

Comments
 (0)