Skip to content

Commit 1c7aafe

Browse files
committed
Bumped Intel SDE version to 9.38.0
Fixed x86_64-apple-darwin freezing. Running the emulated one without docker
1 parent 8c975ef commit 1c7aafe

File tree

5 files changed

+16
-44
lines changed

5 files changed

+16
-44
lines changed

.github/workflows/main.yml

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ jobs:
113113
os: ubuntu-latest
114114
- target: x86_64-unknown-linux-gnu-emulated
115115
os: ubuntu-latest
116-
test_everything: true
117-
rustflags: --cfg stdarch_intel_sde
118116
- target: arm-unknown-linux-gnueabihf
119117
os: ubuntu-latest
120118
- target: armv7-unknown-linux-gnueabihf
@@ -146,7 +144,7 @@ jobs:
146144
- target: aarch64-unknown-linux-gnu
147145
os: ubuntu-latest
148146
- target: x86_64-apple-darwin
149-
os: macos-11
147+
os: macos-13
150148
- target: x86_64-pc-windows-msvc
151149
os: windows-latest
152150
- target: i686-pc-windows-msvc
@@ -175,21 +173,11 @@ jobs:
175173
- uses: actions/checkout@v4
176174
with:
177175
submodules: recursive
178-
- name: Install Rust (rustup)
179-
run: |
180-
rustup update nightly --no-self-update
181-
rustup default nightly
182-
if: matrix.os != 'macos-latest'
183-
- name: Install Rust (macos)
176+
- name: Install Rust
184177
run: |
185-
curl https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
186-
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
187178
rustup update nightly --no-self-update
188179
rustup default nightly
189-
if: matrix.os == 'macos-latest'
190-
- run: |
191-
rustup default nightly
192-
rustup target add ${{ matrix.target }}
180+
- run: rustup target add ${{ matrix.target }}
193181
if: "!endsWith(matrix.target, 'emulated')"
194182
- name: Setup (aarch64-apple-darwin)
195183
run: |
@@ -202,12 +190,6 @@ jobs:
202190
- run: echo "NORUN=1" >> $GITHUB_ENV
203191
shell: bash
204192
if: matrix.norun != '' || startsWith(matrix.target, 'thumb') || matrix.target == 'nvptx64-nvidia-cuda'
205-
- run: echo "STDARCH_TEST_EVERYTHING=1" >> $GITHUB_ENV
206-
shell: bash
207-
if: matrix.test_everything != ''
208-
- run: echo "RUSTFLAGS=${{ matrix.rustflags }}" >> $GITHUB_ENV
209-
shell: bash
210-
if: matrix.rustflags != ''
211193
- run: echo "STDARCH_DISABLE_ASSERT_INSTR=1" >> $GITHUB_ENV
212194
shell: bash
213195
if: matrix.disable_assert_instr != ''
@@ -225,9 +207,21 @@ jobs:
225207
# ... while Linux goes to `run-docker.sh`
226208
- run: ./ci/run-docker.sh ${{ matrix.target }}
227209
shell: bash
228-
if: "matrix.os == 'ubuntu-latest' && !startsWith(matrix.target, 'thumb')"
210+
if: "matrix.os == 'ubuntu-latest' && !startsWith(matrix.target, 'thumb') && !endsWith(matrix.target, 'emulated')"
211+
env:
212+
TARGET: ${{ matrix.target }}
213+
214+
- run: |
215+
rustup target add x86_64-unknown-linux-gnu
216+
wget https://downloadmirror.intel.com/823664/sde-external-9.38.0-2024-04-18-lin.tar.xz
217+
tar -xJf sde-external-9.38.0-2024-04-18-lin.tar.xz
218+
./ci/run.sh
219+
shell: bash
220+
if: endsWith(matrix.target, 'emulated')
229221
env:
230222
TARGET: ${{ matrix.target }}
223+
RUSTFLAGS: --cfg stdarch_intel_sde
224+
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER: ./sde-external-9.38.0-2024-04-18-lin/sde64 -future --
231225
232226
build-std-detect:
233227
needs: [style]

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

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

crates/core_arch/src/x86/avx2.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5200,9 +5200,6 @@ mod tests {
52005200
}
52015201

52025202
#[simd_test(enable = "avx2")]
5203-
// Miri cannot support this until it is clear how it fits in the Rust memory model
5204-
// (non-temporal store)
5205-
#[cfg_attr(miri, ignore)]
52065203
unsafe fn test_mm256_stream_load_si256() {
52075204
let a = _mm256_set_epi64x(5, 6, 7, 8);
52085205
let r = _mm256_stream_load_si256(core::ptr::addr_of!(a) as *const _);

crates/core_arch/src/x86/sse41.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1958,9 +1958,6 @@ mod tests {
19581958
}
19591959

19601960
#[simd_test(enable = "sse4.1")]
1961-
// Miri cannot support this until it is clear how it fits in the Rust memory model
1962-
// (non-temporal store)
1963-
#[cfg_attr(miri, ignore)]
19641961
unsafe fn test_mm_stream_load_si128() {
19651962
let a = _mm_set_epi64x(5, 6);
19661963
let r = _mm_stream_load_si128(core::ptr::addr_of!(a) as *const _);

crates/core_arch/src/x86/xsave.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,6 @@ mod tests {
254254
}
255255
*/
256256

257-
// FIXME: this looks like a bug in Intel's SDE:
258-
#[cfg(not(stdarch_intel_sde))]
259257
#[simd_test(enable = "xsave,xsavec")]
260258
#[cfg_attr(miri, ignore)] // Register saving/restoring is not supported in Miri
261259
unsafe fn xsavec() {

0 commit comments

Comments
 (0)