Skip to content

Commit 1673dbb

Browse files
gnzlbgalexcrichton
authored andcommitted
fix errors/warnings from the stabilization of cfg_target_feature and target_feature (#432)
* fix build after stabilization of cfg_target_feature and target_feature * fix doc tests * fix spurious unused_attributes warning * fix more unused attribute warnings * More unnecessary target features * Remove no longer needed trait imports * Remove fixed upstream workarounds * Fix parsing the #[assert_instr] macro Following upstream proc_macro changes * Fix form and parsing of #[simd_test] * Don't use Cargo features for testing modes Instead use RUSTFLAGS with `--cfg`. This'll help us be compatible with the latest Cargo where a tweak to workspaces and features made the previous invocations we had invalid. * Don't thread RUSTFLAGS through docker * Re-gate on x86 verification Closes #411
1 parent 1ea18a5 commit 1673dbb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1134
-1187
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ matrix:
88
- env: TARGET=i586-unknown-linux-gnu
99
- env: TARGET=i686-unknown-linux-gnu
1010
- env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
11-
- env: TARGET=x86_64-unknown-linux-gnu-emulated NO_ADD=1 STDSIMD_TEST_EVERYTHING=1 FEATURES="intel_sde"
11+
- env: TARGET=x86_64-unknown-linux-gnu-emulated NO_ADD=1 STDSIMD_TEST_EVERYTHING=1
1212
- env: TARGET=arm-unknown-linux-gnueabihf
1313
- env: TARGET=armv7-unknown-linux-gnueabihf
1414
- env: TARGET=aarch64-unknown-linux-gnu
@@ -55,7 +55,6 @@ matrix:
5555
cargo clippy --all -- -D clippy-pedantic
5656
allow_failures:
5757
- env: CLIPPY=On TARGET=x86_64-unknown-linux-gnu NO_ADD=1
58-
- env: VERIFY_X86
5958

6059
before_install:
6160
# FIXME (travis-ci/travis-ci#8920) shouldn't be necessary...

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

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
RUN wget https://github.com/gnzlbg/intel_sde/raw/master/sde-external-8.16.0-2018-01-30-lin.tar.bz2
1212
RUN tar -xjf sde-external-8.16.0-2018-01-30-lin.tar.bz2
1313
ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="/sde-external-8.16.0-2018-01-30-lin/sde64 --"
14+
ENV RUSTFLAGS --cfg stdsimd_intel_sde

ci/run-docker.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ run() {
1717
--env CARGO_HOME=/cargo \
1818
--volume `rustc --print sysroot`:/rust:ro \
1919
--env TARGET=$target \
20-
--env FEATURES=$2 \
2120
--env STDSIMD_TEST_EVERYTHING \
2221
--volume `pwd`:/checkout:ro \
2322
--volume `pwd`/target:/checkout/target \
@@ -33,5 +32,5 @@ if [ -z "$1" ]; then
3332
run $d
3433
done
3534
else
36-
run $1 $2
35+
run $1
3736
fi

ci/run.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export RUST_TEST_THREADS=1
1010
#export RUST_BACKTRACE=full
1111
#export RUST_TEST_NOCAPTURE=1
1212

13-
FEATURES="strict,$FEATURES"
13+
RUSTFLAGS="$RUSTFLAGS --cfg stdsimd_strict"
1414

1515
# FIXME: on armv7 neon intrinsics require the neon target-feature to be
1616
# unconditionally enabled.
@@ -27,9 +27,8 @@ echo "FEATURES=${FEATURES}"
2727
echo "OBJDUMP=${OBJDUMP}"
2828

2929
cargo_test() {
30-
cmd="cargo test --target=$TARGET --features $FEATURES $1"
30+
cmd="cargo test --target=$TARGET $1"
3131
cmd="$cmd -p coresimd -p stdsimd"
32-
cmd="$cmd --manifest-path crates/stdsimd/Cargo.toml"
3332
cmd="$cmd -- $2"
3433
$cmd
3534
}

coresimd/aarch64/crypto.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ mod tests {
189189
use std::mem;
190190
use stdsimd_test::simd_test;
191191

192-
#[simd_test = "crypto"]
192+
#[simd_test(enable = "crypto")]
193193
unsafe fn test_vaeseq_u8() {
194194
let data = u8x16::new(1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8)
195195
.into_bits();
@@ -219,7 +219,7 @@ mod tests {
219219
);
220220
}
221221

222-
#[simd_test = "crypto"]
222+
#[simd_test(enable = "crypto")]
223223
unsafe fn test_vaesdq_u8() {
224224
let data = u8x16::new(1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8)
225225
.into_bits();
@@ -249,7 +249,7 @@ mod tests {
249249
);
250250
}
251251

252-
#[simd_test = "crypto"]
252+
#[simd_test(enable = "crypto")]
253253
unsafe fn test_vaesmcq_u8() {
254254
let data = u8x16::new(1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8)
255255
.into_bits();
@@ -277,7 +277,7 @@ mod tests {
277277
);
278278
}
279279

280-
#[simd_test = "crypto"]
280+
#[simd_test(enable = "crypto")]
281281
unsafe fn test_vaesimcq_u8() {
282282
let data = u8x16::new(1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8)
283283
.into_bits();
@@ -305,13 +305,13 @@ mod tests {
305305
);
306306
}
307307

308-
#[simd_test = "crypto"]
308+
#[simd_test(enable = "crypto")]
309309
unsafe fn test_vsha1h_u32() {
310310
assert_eq!(vsha1h_u32(0x1234), 0x048d);
311311
assert_eq!(vsha1h_u32(0x5678), 0x159e);
312312
}
313313

314-
#[simd_test = "crypto"]
314+
#[simd_test(enable = "crypto")]
315315
unsafe fn test_vsha1su0q_u32() {
316316
let r: u32x4 = vsha1su0q_u32(
317317
u32x4::new(0x1234_u32, 0x5678_u32, 0x9abc_u32, 0xdef0_u32)
@@ -324,7 +324,7 @@ mod tests {
324324
assert_eq!(r, u32x4::new(0x9abc, 0xdef0, 0x1234, 0x5678));
325325
}
326326

327-
#[simd_test = "crypto"]
327+
#[simd_test(enable = "crypto")]
328328
unsafe fn test_vsha1su1q_u32() {
329329
let r: u32x4 = vsha1su1q_u32(
330330
u32x4::new(0x1234, 0x5678, 0x9abc, 0xdef0).into_bits(),
@@ -336,7 +336,7 @@ mod tests {
336336
);
337337
}
338338

339-
#[simd_test = "crypto"]
339+
#[simd_test(enable = "crypto")]
340340
unsafe fn test_vsha1cq_u32() {
341341
let r: u32x4 = vsha1cq_u32(
342342
u32x4::new(0x1234, 0x5678, 0x9abc, 0xdef0).into_bits(),
@@ -349,7 +349,7 @@ mod tests {
349349
);
350350
}
351351

352-
#[simd_test = "crypto"]
352+
#[simd_test(enable = "crypto")]
353353
unsafe fn test_vsha1pq_u32() {
354354
let r: u32x4 = vsha1pq_u32(
355355
u32x4::new(0x1234, 0x5678, 0x9abc, 0xdef0).into_bits(),
@@ -362,7 +362,7 @@ mod tests {
362362
);
363363
}
364364

365-
#[simd_test = "crypto"]
365+
#[simd_test(enable = "crypto")]
366366
unsafe fn test_vsha1mq_u32() {
367367
let r: u32x4 = vsha1mq_u32(
368368
u32x4::new(0x1234, 0x5678, 0x9abc, 0xdef0).into_bits(),
@@ -375,7 +375,7 @@ mod tests {
375375
);
376376
}
377377

378-
#[simd_test = "crypto"]
378+
#[simd_test(enable = "crypto")]
379379
unsafe fn test_vsha256hq_u32() {
380380
let r: u32x4 = vsha256hq_u32(
381381
u32x4::new(0x1234, 0x5678, 0x9abc, 0xdef0).into_bits(),
@@ -388,7 +388,7 @@ mod tests {
388388
);
389389
}
390390

391-
#[simd_test = "crypto"]
391+
#[simd_test(enable = "crypto")]
392392
unsafe fn test_vsha256h2q_u32() {
393393
let r: u32x4 = vsha256h2q_u32(
394394
u32x4::new(0x1234, 0x5678, 0x9abc, 0xdef0).into_bits(),
@@ -401,7 +401,7 @@ mod tests {
401401
);
402402
}
403403

404-
#[simd_test = "crypto"]
404+
#[simd_test(enable = "crypto")]
405405
unsafe fn test_vsha256su0q_u32() {
406406
let r: u32x4 = vsha256su0q_u32(
407407
u32x4::new(0x1234, 0x5678, 0x9abc, 0xdef0).into_bits(),
@@ -413,7 +413,7 @@ mod tests {
413413
);
414414
}
415415

416-
#[simd_test = "crypto"]
416+
#[simd_test(enable = "crypto")]
417417
unsafe fn test_vsha256su1q_u32() {
418418
let r: u32x4 = vsha256su1q_u32(
419419
u32x4::new(0x1234, 0x5678, 0x9abc, 0xdef0).into_bits(),

0 commit comments

Comments
 (0)