archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-28 22:57:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
PKGBUILDs/extra/thunderbird/thunderbird-78.5-rust-1.48.patch

3942 lines
195 KiB
Diff
Raw Normal View History

extra/thunderbird to 78.5.1-1
2020-12-14 23:26:46 +00:00
# HG changeset patch
# User Henri Sivonen <hsivonen@hsivonen.fi>
# Date 1604046593 0
# Node ID 632353012d05c8e71314d27edca945ce9c13f4ea
# Parent 2876425c75f75f638b41e8c6093e84b817938a9a
Bug 1667736 - Update packed_simd to compile on Rust 1.48. r=glandium
Differential Revision: https://phabricator.services.mozilla.com/D91572
diff --git a/.cargo/config.in b/.cargo/config.in
--- a/.cargo/config.in
+++ b/.cargo/config.in
@@ -45,7 +45,7 @@ rev = "21c26326f5f45f415c49eac4ba5bc41a2
[source."https://github.com/hsivonen/packed_simd"]
git = "https://github.com/hsivonen/packed_simd"
replace-with = "vendored-sources"
-rev = "3541e3818fdc7c2a24f87e3459151a4ce955a67a"
+rev = "0917fe780032a6bbb23d71be545f9c1834128d75"
[source."https://github.com/djg/cubeb-pulse-rs"]
git = "https://github.com/djg/cubeb-pulse-rs"
diff --git a/Cargo.lock b/Cargo.lock
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3573,18 +3573,18 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
dependencies = [
"stable_deref_trait",
]
[[package]]
name = "packed_simd"
-version = "0.3.3"
-source = "git+https://github.com/hsivonen/packed_simd?rev=3541e3818fdc7c2a24f87e3459151a4ce955a67a#3541e3818fdc7c2a24f87e3459151a4ce955a67a"
+version = "0.3.4"
+source = "git+https://github.com/hsivonen/packed_simd?rev=0917fe780032a6bbb23d71be545f9c1834128d75#0917fe780032a6bbb23d71be545f9c1834128d75"
dependencies = [
"cfg-if",
]
[[package]]
name = "parity-wasm"
version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,7 @@ panic = "abort"
[patch.crates-io]
libudev-sys = { path = "dom/webauthn/libudev-sys" }
-packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
+packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
diff --git a/third_party/rust/packed_simd/.cargo-checksum.json b/third_party/rust/packed_simd/.cargo-checksum.json
--- a/third_party/rust/packed_simd/.cargo-checksum.json
+++ b/third_party/rust/packed_simd/.cargo-checksum.json
@@ -1,1 +1,1 @@
-{"files":{".appveyor.yml":"f1ed01850e0d725f9498f52a1a63ddf40702ad6e0bf5b2d7c4c04d76e96794a3",".travis.yml":"e9258d9a54fdaf4cbc12405fe5993ac4497eb2b29021691dbc91b19cb9b52227","Cargo.toml":"089941ba3c89ea111cbea3cc3abdcdcf2b9d0ae0db268d7269ee38226db950e5","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","bors.toml":"dee881dc69b9b7834e4eba5d95c3ed5a416d4628815a167d6a22d4cb4fb064b8","build.rs":"f3baefc5e5bb9b250e762a1466371b922fd7ee4243c217b2d014307603c2f57a","ci/all.sh":"a23d14e10cb26a0eb719e389c30eb955fa53cddcd436890646df09af640bd2eb","ci/android-install-ndk.sh":"0f1746108cc30bf9b9ba45bcde7b19fc1a8bdf5b0258035b4eb8dc69b75efac4","ci/android-install-sdk.sh":"3490432022c5c8f5a115c084f7a9aca1626f96c0c87ffb62019228c4346b47e4","ci/android-sysimage.sh":"ebf4e5daa1f0fe1b2092b79f0f3f161c4c4275cb744e52352c4d81ab451e4c5a","ci/benchmark.sh":"b61d19ef6b90deba8fb79dee74c8b062d94844676293da346da87bb78a9a49a4","ci/deploy_and_run_on_ios_simulator.rs":"ec8ecf82d92072676aa47f0d1a3d021b60a7ae3531153ef12d2ff4541fc294dc","ci/docker/aarch64-linux-android/Dockerfile":"ace2e7d33c87bc0f6d3962a4a3408c04557646f7f51ab99cfbf574906796b016","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"1ecdac757101d951794fb2ab0deaa278199cf25f2e08a15c7d40ff31a8556184","ci/docker/arm-linux-androideabi/Dockerfile":"370e55d3330a413a3ccf677b3afb3e0ef9018a5fab263faa97ae8ac017fc2286","ci/docker/arm-unknown-linux-gnueabi/Dockerfile":"e25d88f6c0c94aada3d2e3f08243f755feb7e869dc5dc505b3799719cb1af591","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"f126f4c7bae8c11ab8b16df06ad997863f0838825a9c08c9899a3eedb6d570bd","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"b647545c158ee480a4c581dbdc1f57833aef056c8d498acc04b573e842bf803c","ci/docker/i586-unknown-linux-gnu/Dockerfile":"0d492759017307ccf74dc2aa4a8cf6623daf3dc728c708dc2b18fa7940800cba","ci/docker/i686-unknown-linux-gnu/Dockerfile":"0d492759017307ccf74dc2aa4a8cf6623daf3dc728c708dc2b18fa7940800cba","ci/docker/mips-unknown-linux-gnu/Dockerfile":"323776469bb7b160385f3621d66e3ee14c75242f8180f916e65af048a29d4ea0","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"c647f6948a9a43b0be695cbed4eac752120d0faf28e5e69c718cb10406921dab","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"77bfd00cc8639509be381b394f077e39b45a00158ad61b4e1656714c714665d1","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"ec5bea6c98a3b626731fdb95f9ff2d1182639c76e8fb16d3271d0fc884901524","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"4f2b662de66e83d1354f650b7077692309637f786c2ea5516c31b5c2ee10af2d","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"a9595402b772bc365982e22a0096a8988825d90b09b5faa97ab192e76072f71d","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"df3c381c157439695ae8cd10ab71664702c061e3b4ab22906a5ad6c2680acfed","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"93fb44df3d7fd31ead158570667c97b5076a05c3d968af4a84bc13819a8f2db8","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"da1c39a3ff1fe22e41395fa7c8934e90b4c1788e551b9aec6e38bfd94effc437","ci/docker/thumbv7neon-linux-androideabi/Dockerfile":"c2decd5591bd7a09378901bef629cd944acf052eb55e4f35b79eb9cb4d62246a","ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile":"75c0c56161c7382b439de74c00de1c0e3dc9d59560cd6720976a751034b78714","ci/docker/wasm32-unknown-unknown/Dockerfile":"3e5f294bc1e004aa599086c2af49d6f3e7459fa250f5fbdd60cf67d53db78758","ci/docker/x86_64-linux-android/Dockerfile":"685040273cf350d5509e580ac451555efa19790c8723ca2af066adadc6880ad2","ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile":"44b6203d9290bfdc53d81219f0937e1110847a23dd982ec8c4de388354f01536","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"d253c86803b22da428fa9cc671a05f18d3318eca7733b8dccb4f7be1ddf524c5","ci/dox.sh":"5b61711be47a4e3dde0ddd15ba73d256ea95fd75af3897732c24db1dc7e66366","ci/linux-s390x.sh":"d6b732d7795b4ba131326aff893bca6228a7d2eb0e9402f135705413dbbe0dce","ci/linux-sparc64.sh":"c92966838b1ab7ad3b7a344833ee726aba6b647cf5952e56f0ad1ba420b13325","ci/lld-shim.rs":"3d7f71ec
\ No newline at end of file
+{"files":{".appveyor.yml":"f1ed01850e0d725f9498f52a1a63ddf40702ad6e0bf5b2d7c4c04d76e96794a3",".travis.yml":"d56de6531d3c4880e3aada85ac8e6d7388e5d781871e181cb8ade2a746d5d5f5","Cargo.toml":"e94ccb82002e8b55680c2c5fec554a9e864c5f354e113278d0aa927df279330d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"49d01e49a33393af64fa6c813b6a724f68a4d1abfbedcb96413651ed105aa820","bors.toml":"dee881dc69b9b7834e4eba5d95c3ed5a416d4628815a167d6a22d4cb4fb064b8","build.rs":"c3312e786c7fcb8f16c0785fe235ebbcf43fbeab6d7d683752f62043ca92d887","ci/all.sh":"2ae6b2445b4db83833e40b37efd0016c6b9879ee988b9b3ef94db5439a3e1606","ci/android-install-ndk.sh":"0f1746108cc30bf9b9ba45bcde7b19fc1a8bdf5b0258035b4eb8dc69b75efac4","ci/android-install-sdk.sh":"3490432022c5c8f5a115c084f7a9aca1626f96c0c87ffb62019228c4346b47e4","ci/android-sysimage.sh":"ebf4e5daa1f0fe1b2092b79f0f3f161c4c4275cb744e52352c4d81ab451e4c5a","ci/benchmark.sh":"b61d19ef6b90deba8fb79dee74c8b062d94844676293da346da87bb78a9a49a4","ci/deploy_and_run_on_ios_simulator.rs":"ec8ecf82d92072676aa47f0d1a3d021b60a7ae3531153ef12d2ff4541fc294dc","ci/docker/aarch64-linux-android/Dockerfile":"ace2e7d33c87bc0f6d3962a4a3408c04557646f7f51ab99cfbf574906796b016","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"da88c0d50f16dc08448c7fdf1fa5ed2cbe576acf9e7dd85b5b818621b2a8c702","ci/docker/arm-linux-androideabi/Dockerfile":"370e55d3330a413a3ccf677b3afb3e0ef9018a5fab263faa97ae8ac017fc2286","ci/docker/arm-unknown-linux-gnueabi/Dockerfile":"bb5f8ae890707c128652290ffc544447643bf12037ddd73c6ad6989f848cb380","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"1afaefcbc05b740859acd4e067bc92439be6bcbe8f2e9678474fb434bcd398d9","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"8282ea707a94109beed47a57574755e2d58401735904a03f85fb64c578c53b4f","ci/docker/i586-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/i686-unknown-linux-gnu/Dockerfile":"49792922269f371bd29da4727e9085101b27be67a6b97755d0196c63317f7abb","ci/docker/mips-unknown-linux-gnu/Dockerfile":"b2ebc25797612c4f8395fe9d407725156044955bfbcf442036b7f55b43a5f9da","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"b0c1692ac65bc56dd30494b1993d8e929c48cc9c4b92029b7c7592af6d4f9220","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"4e9249c179300138141d0b2b7401b11897f64aed69f541f078c1db4594df2827","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"3164c52b0dcbb01afa78292b15b5c43503ccf0491cf6eb801ec2bf22ae274e52","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"786f799d0b56eb54d7b6c4b00e1aed4ce81776e14e44767e083c89d014b72004","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"e8bc363837cd9c2d8b22402acb8c1c329efc11ba5d12170603d2fe2eae9da059","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"47998d45b781d797b9e6085ebe898d90de0c952b54537a8db4e8d7503eb032d9","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"93fb44df3d7fd31ead158570667c97b5076a05c3d968af4a84bc13819a8f2db8","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"da1c39a3ff1fe22e41395fa7c8934e90b4c1788e551b9aec6e38bfd94effc437","ci/docker/thumbv7neon-linux-androideabi/Dockerfile":"c2decd5591bd7a09378901bef629cd944acf052eb55e4f35b79eb9cb4d62246a","ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile":"51955a8bf3c4d440f47382af6f5426ebff94ab01a04da36175babda9a057740f","ci/docker/wasm32-unknown-unknown/Dockerfile":"3e5f294bc1e004aa599086c2af49d6f3e7459fa250f5fbdd60cf67d53db78758","ci/docker/x86_64-linux-android/Dockerfile":"685040273cf350d5509e580ac451555efa19790c8723ca2af066adadc6880ad2","ci/docker/x86_64-unknown-linux-gnu-emulated/Dockerfile":"44b6203d9290bfdc53d81219f0937e1110847a23dd982ec8c4de388354f01536","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"7f4e3ca5fa288ea70edb4d1f75309708cd30b192e2e4444e61c4d5b3b58f89cf","ci/dox.sh":"434e9611c52e389312d2b03564adf09429f10cc76fe66a8644adb104903b87b7","ci/linux-s390x.sh":"d6b732d7795b4ba131326aff893bca6228a7d2eb0e9402f135705413dbbe0dce","ci/linux-sparc64.sh":"c92966838b1ab
\ No newline at end of file
diff --git a/third_party/rust/packed_simd/.travis.yml b/third_party/rust/packed_simd/.travis.yml
--- a/third_party/rust/packed_simd/.travis.yml
+++ b/third_party/rust/packed_simd/.travis.yml
@@ -1,291 +1,222 @@
language: rust
-sudo: false
rust: nightly
+os: linux
+dist: focal
stages:
- tools
- - linux-tier1
- - osx-tier1
- - osx-tier2
- - linux-tier2
- - android
+ - build-test-verify # Passes full test suite, permit no regressions (unless it's rustup :/)
+ - 32bit-tier1
+ - 64bit-tier2
+ - 32bit-tier2
-matrix:
- fast_finish: true
+jobs:
+ fast_finish: true
include:
# Android:
- - env: TARGET=x86_64-linux-android NOVERIFY=1
+ - env: TARGET=x86_64-linux-android
name: "x86_64-unknown-linux-android + SSE2"
- stage: android
+ stage: build-test-verify
- env: TARGET=arm-linux-androideabi
name: "arm-linux-androideabi"
- stage: android
+ stage: build-test-verify
- env: TARGET=arm-linux-androideabi RUSTFLAGS="-C target-feature=+v7,+neon"
name: "arm-linux-androideabi + NEON"
- stage: android
- - env: TARGET=aarch64-linux-android
- name: "aarch64-unknown-linux-android"
- stage: android
- - env: TARGET=aarch64-linux-android RUSTFLAGS="-C target-feature=+neon"
- name: "aarch64-unknown-linux-android + NEON"
- stage: android
+ stage: build-test-verify
+ - name: "aarch64-unknown-linux-android + NEON"
+ env: TARGET=aarch64-linux-android RUSTFLAGS="-C target-feature=+neon"
+ stage: build-test-verify
- env: TARGET="thumbv7neon-linux-androideabi"
name: "thumbv7neon-linux-androideabi"
- stage: android
+ stage: 32bit-tier2
# Linux:
- env: TARGET=i586-unknown-linux-gnu
name: "i586-unknown-linux-gnu"
- stage: linux-tier2
+ stage: 32bit-tier2
- env: TARGET=i586-unknown-linux-gnu RUSTFLAGS="-C target-feature=+sse"
name: "i586-unknown-linux-gnu + SSE"
- stage: linux-tier2
+ stage: 32bit-tier2
- env: TARGET=i586-unknown-linux-gnu RUSTFLAGS="-C target-feature=+sse2"
name: "i586-unknown-linux-gnu + SSE2"
- stage: linux-tier2
+ stage: 32bit-tier2
- env: TARGET=i686-unknown-linux-gnu
name: "i686-unknown-linux-gnu + SSE2"
- stage: linux-tier1
+ stage: 32bit-tier1
- env: TARGET=i686-unknown-linux-gnu RUSTFLAGS="-C target-feature=+sse4.2"
name: "i686-unknown-linux-gnu + SSE4.2"
- stage: linux-tier1
+ stage: 32bit-tier1
- env: TARGET=i686-unknown-linux-gnu RUSTFLAGS="-C target-feature=+avx2"
name: "i686-unknown-linux-gnu + AVX2"
- stage: linux-tier1
- - env: TARGET=x86_64-unknown-linux-gnu
- name: "x86_64-unknown-linux-gnu + SSE2"
- install: rustup component add rustfmt-preview
- stage: linux-tier1
+ stage: 32bit-tier1
- env: TARGET=x86_64-unknown-linux-gnu RUSTFLAGS="-C target-feature=+sse4.2"
name: "x86_64-unknown-linux-gnu + SSE4.2"
install: rustup component add rustfmt-preview
- stage: linux-tier1
- - env: TARGET=x86_64-unknown-linux-gnu RUSTFLAGS="-C target-feature=+avx"
- name: "x86_64-unknown-linux-gnu + AVX"
- install: rustup component add rustfmt-preview
- stage: linux-tier1
+ stage: build-test-verify
- env: TARGET=x86_64-unknown-linux-gnu RUSTFLAGS="-C target-feature=+avx2"
name: "x86_64-unknown-linux-gnu + AVX2"
install: rustup component add rustfmt-preview
- stage: linux-tier1
- - env: TARGET=x86_64-unknown-linux-gnu-emulated
- name: "Intel SDE + SSE2"
- install: true
- stage: linux-tier1
- - env: TARGET=x86_64-unknown-linux-gnu-emulated RUSTFLAGS="-C target-feature=+sse4.2"
- name: "Intel SDE + SSE4.2"
- install: true
- stage: linux-tier1
- - env: TARGET=x86_64-unknown-linux-gnu-emulated RUSTFLAGS="-C target-feature=+avx"
- name: "Intel SDE + AVX"
- install: true
- stage: linux-tier1
- - env: TARGET=x86_64-unknown-linux-gnu-emulated RUSTFLAGS="-C target-feature=+avx2"
- name: "Intel SDE + AVX2"
- install: true
- stage: linux-tier1
- - env: TARGET=x86_64-unknown-linux-gnu-emulated RUSTFLAGS="-C target-feature=+avx-512f"
- name: "Intel SDE + AVX-512"
- install: true
- stage: linux-tier1
- - env: TARGET=arm-unknown-linux-gnueabi
- name: "arm-unknown-linux-gnueabi"
- stage: linux-tier2
+ stage: build-test-verify
- env: TARGET=arm-unknown-linux-gnueabi RUSTFLAGS="-C target-feature=+v7,+neon"
name: "arm-unknown-linux-gnueabi + NEON"
- stage: linux-tier2
+ stage: build-test-verify
- env: TARGET=arm-unknown-linux-gnueabihf
name: "arm-unknown-linux-gnueabihf"
- stage: linux-tier2
+ stage: build-test-verify
- env: TARGET=arm-unknown-linux-gnueabihf RUSTFLAGS="-C target-feature=+v7,+neon"
name: "arm-unknown-linux-gnueabihf + NEON"
- stage: linux-tier2
+ stage: build-test-verify
- env: TARGET=armv7-unknown-linux-gnueabihf
name: "armv7-unknown-linux-gnueabihf"
- stage: linux-tier2
+ stage: build-test-verify
- env: TARGET=armv7-unknown-linux-gnueabihf RUSTFLAGS="-C target-feature=+neon"
name: "armv7-unknown-linux-gnueabihf + NEON"
- stage: linux-tier2
+ stage: build-test-verify
- env: TARGET="thumbv7neon-unknown-linux-gnueabihf"
name: "thumbv7neon-unknown-linux-gnueabihf"
- stage: linux-tier2
- - env: TARGET=aarch64-unknown-linux-gnu
- name: "aarch64-unknown-linux-gnu"
- stage: linux-tier2
- - env: TARGET=aarch64-unknown-linux-gnu RUSTFLAGS="-C target-feature=+neon"
- name: "aarch64-unknown-linux-gnu + NEON"
- stage: linux-tier2
+ stage: 32bit-tier2
+ - name: "aarch64-unknown-linux-gnu + NEON"
+ env: TARGET=aarch64-unknown-linux-gnu RUSTFLAGS="-C target-feature=+neon"
+ stage: build-test-verify
- env: TARGET=mips-unknown-linux-gnu
name: "mips-unknown-linux-gnu"
- stage: linux-tier2
+ stage: 32bit-tier2
- env: TARGET=mipsel-unknown-linux-musl
name: "mipsel-unknown-linux-musl"
- stage: linux-tier2
+ stage: 32bit-tier2
- env: TARGET=mips64-unknown-linux-gnuabi64
name: "mips64-unknown-linux-gnuabi64"
- stage: linux-tier2
+ stage: 64bit-tier2
- env: TARGET=mips64el-unknown-linux-gnuabi64
name: "mips64el-unknown-linux-gnuabi64"
- stage: linux-tier2
+ stage: 64bit-tier2
# FIXME: https://github.com/rust-lang-nursery/packed_simd/issues/18
# env: TARGET=mips64el-unknown-linux-gnuabi64 RUSTFLAGS="-C target-feature=+msa -C target-cpu=mips64r6"
- env: TARGET=powerpc-unknown-linux-gnu
name: "powerpc-unknown-linux-gnu"
- stage: linux-tier2
+ stage: 32bit-tier2
- env: TARGET=powerpc64-unknown-linux-gnu
name: "powerpc64-unknown-linux-gnu"
- stage: linux-tier2
- - env: TARGET=powerpc64le-unknown-linux-gnu
- name: "powerpc64le-unknown-linux-gnu"
- stage: linux-tier2
- - env: TARGET=powerpc64le-unknown-linux-gnu RUSTFLAGS="-C target-feature=+altivec"
- name: "powerpc64le-unknown-linux-gnu + ALTIVEC"
- stage: linux-tier2
- - env: TARGET=powerpc64le-unknown-linux-gnu RUSTFLAGS="-C target-feature=+vsx"
- name: "powerpc64le-unknown-linux-gnu + VSX"
- stage: linux-tier2
- - env: TARGET=s390x-unknown-linux-gnu
- name: "s390x-unknown-linux-gnu"
- stage: linux-tier2
+ stage: 64bit-tier2
+ - name: "powerpc64le-unknown-linux-gnu"
+ env: TARGET=powerpc64le-unknown-linux-gnu
+ stage: build-test-verify
+ - name: "powerpc64le-unknown-linux-gnu + ALTIVEC"
+ env: TARGET=powerpc64le-unknown-linux-gnu RUSTFLAGS="-C target-feature=+altivec"
+ stage: build-test-verify
+ - name: "powerpc64le-unknown-linux-gnu + VSX"
+ env: TARGET=powerpc64le-unknown-linux-gnu RUSTFLAGS="-C target-feature=+vsx"
+ stage: build-test-verify
+ - name: "s390x-unknown-linux-gnu"
+ env: TARGET=s390x-unknown-linux-gnu
+ stage: 64bit-tier2
- env: TARGET=sparc64-unknown-linux-gnu
name: "sparc64-unknown-linux-gnu"
- stage: linux-tier2
+ stage: 64bit-tier2
# WebAssembly:
- env: TARGET=wasm32-unknown-unknown
name: "wasm32-unknown-unknown"
- stage: osx-tier1 # For now
+ stage: 32bit-tier2
# MacOSX:
- os: osx
- env: TARGET=i686-apple-darwin
- name: "i686-apple-darwin + SSE2"
- script: ci/run.sh
- osx_image: xcode10
- stage: osx-tier1
- - os: osx
- env: TARGET=i686-apple-darwin RUSTFLAGS="-C target-feature=+sse4.2"
- name: "i686-apple-darwin + SSE4.2"
- script: ci/run.sh
- osx_image: xcode10
- stage: osx-tier1
- # Travis-CI OSX build bots do not support AVX2:
- - os: osx
- env: TARGET=i686-apple-darwin RUSTFLAGS="-C target-feature=+avx"
- name: "i686-apple-darwin + AVX"
- script: ci/run.sh
- osx_image: xcode10
- stage: osx-tier1
- - os: osx
- env: TARGET=x86_64-apple-darwin
- name: "x86_64-apple-darwin + SSE2"
- install: true
- script: ci/run.sh
- osx_image: xcode10
- stage: osx-tier1
- - os: osx
env: TARGET=x86_64-apple-darwin RUSTFLAGS="-C target-feature=+sse4.2"
name: "x86_64-apple-darwin + SSE4.2"
install: true
script: ci/run.sh
osx_image: xcode10
- stage: osx-tier1
+ stage: build-test-verify
# Travis-CI OSX build bots do not support AVX2:
- os: osx
env: TARGET=x86_64-apple-darwin RUSTFLAGS="-C target-feature=+avx"
name: "x86_64-apple-darwin + AVX"
install: true
script: ci/run.sh
osx_image: xcode10
- stage: osx-tier1
+ stage: build-test-verify
# *BSDs:
#- env: TARGET=i686-unknown-freebsd NORUN=1
# script: ci/run.sh
#- env: TARGET=x86_64-unknown-freebsd NORUN=1
# script: ci/run.sh
#- env: TARGET=x86_64-unknown-netbsd NORUN=1
# script: ci/run.sh
# Solaris:
#- env: TARGET=x86_64-sun-solaris NORUN=1
# script: ci/run.sh
# iOS:
- os: osx
- env: TARGET=i386-apple-ios
- name: "i386-apple-ios"
- script: ci/run.sh
- osx_image: xcode9.4
- stage: osx-tier2
- - os: osx
env: TARGET=x86_64-apple-ios
name: "x86_64-apple-ios + SSE2"
script: ci/run.sh
osx_image: xcode9.4
- stage: osx-tier2
- - os: osx
- env: TARGET=armv7-apple-ios NORUN=1
- name: "armv7-apple-ios [Build only]"
- script: ci/run.sh
+ stage: 64bit-tier2
+ - name: "aarch64-apple-ios + NEON"
+ env: TARGET=aarch64-apple-ios RUSTFLAGS="-C target-feature=+neon"
+ os: osx
osx_image: xcode9.4
- stage: osx-tier2
- - os: osx
- env: TARGET=aarch64-apple-ios NORUN=1
- name: "aarch64-apple-ios [Build only]"
script: ci/run.sh
- osx_image: xcode9.4
- stage: osx-tier2
+ stage: 64bit-tier2
# BENCHMARKS:
- name: "Benchmarks - x86_64-unknown-linux-gnu"
install: TARGET=x86_64-unknown-linux-gnu ./ci/setup_benchmarks.sh
- script: PATH=$(pwd):$PATH NORUN=1 VERIFY=1 FEATURES=core_arch,ispc,sleef-sys ci/benchmark.sh
+ # FIXME: Use `core_arch,sleef-sys` features once they works again
+ script: PATH=$(pwd):$PATH NORUN=1 VERIFY=1 FEATURES=ispc ci/benchmark.sh
stage: tools
- name: "Benchmarks - x86_64-apple-darwin"
install: TARGET=x86_64-apple-darwin ./ci/setup_benchmarks.sh
- script: PATH=$(pwd):$PATH NORUN=1 VERIFY=1 FEATURES=core_arch,ispc,sleef-sys ci/benchmark.sh
+ # FIXME: Use `core_arch,sleef-sys` features once they works again
+ script: PATH=$(pwd):$PATH NORUN=1 VERIFY=1 FEATURES=ispc ci/benchmark.sh
os: osx
osx_image: xcode9.4
stage: tools
# TOOLS:
- name: "Documentation"
- install: cargo install mdbook
+ before_install:
+ - sudo add-apt-repository -y ppa:deadsnakes/ppa
+ - sudo apt-get update -y
+ - sudo apt-get install -y python3.9
+ install:
+ - cargo install mdbook
script: ci/dox.sh
stage: tools
- name: "rustfmt"
install: true
- before_script: rustup component add rustfmt-preview
- script: ci/all.sh check_fmt || true
+ script: |
+ if rustup component add rustfmt-preview ; then
+ ci/all.sh check_fmt || true
+ fi
stage: tools
- name: "clippy"
install: true
- before_script: rustup component add clippy-preview
- script: ci/all.sh clippy
+ script: |
+ if rustup component add clippy-preview ; then
+ ci/all.sh clippy
+ fi
stage: tools
allow_failures:
# FIXME: ISPC cannot be found?
- name: "Benchmarks - x86_64-apple-darwin"
- # FIXME: TBD
- - env: TARGET=powerpc-unknown-linux-gnu
- - env: TARGET=powerpc64-unknown-linux-gnu
- - env: TARGET=powerpc64le-unknown-linux-gnu
- - env: TARGET=powerpc64le-unknown-linux-gnu RUSTFLAGS="-C target-feature=+altivec"
- - env: TARGET=powerpc64le-unknown-linux-gnu RUSTFLAGS="-C target-feature=+vsx"
+ # FIXME: i686 fails in inlining, apparently
+ - stage: 32bit-tier1
#- env: TARGET=i686-unknown-freebsd NORUN=1
#- env: TARGET=x86_64-unknown-freebsd NORUN=1
#- env: TARGET=x86_64-unknown-netbsd NORUN=1
#- env: TARGET=x86_64-sun-solaris NORUN=1
# FIXME: TBD
- - env: TARGET=arm-linux-androideabi
- - env: TARGET=arm-linux-androideabi RUSTFLAGS="-C target-feature=+v7,+neon"
- - env: TARGET=aarch64-linux-android
- - env: TARGET=aarch64-linux-android RUSTFLAGS="-C target-feature=+neon"
+ - stage: 64bit-tier2
+ - stage: 32bit-tier2
# FIXME: iOS
# https://github.com/rust-lang-nursery/packed_simd/issues/26
- - env: TARGET=i386-apple-ios
- env: TARGET=x86_64-apple-ios
+ # Is this related to the above? Mysterious test failure
+ - name: "aarch64-apple-ios + NEON"
# FIXME: https://github.com/rust-lang-nursery/packed_simd/issues/182
- env: TARGET=arm-unknown-linux-gnueabi RUSTFLAGS="-C target-feature=+v7,+neon"
- env: TARGET=arm-unknown-linux-gnueabihf RUSTFLAGS="-C target-feature=+v7,+neon"
- env: TARGET=armv7-unknown-linux-gnueabihf RUSTFLAGS="-C target-feature=+neon"
# FIXME: https://github.com/rust-lang-nursery/packed_simd/issues/183
- env: TARGET=wasm32-unknown-unknown
diff --git a/third_party/rust/packed_simd/Cargo.toml b/third_party/rust/packed_simd/Cargo.toml
--- a/third_party/rust/packed_simd/Cargo.toml
+++ b/third_party/rust/packed_simd/Cargo.toml
@@ -1,11 +1,11 @@
[package]
name = "packed_simd"
-version = "0.3.3"
+version = "0.3.4"
authors = ["Gonzalo Brito Gadeschi <gonzalobg88@gmail.com>"]
description = "Portable Packed SIMD vectors"
documentation = "https://docs.rs/crate/packed_simd/"
homepage = "https://github.com/rust-lang-nursery/packed_simd"
repository = "https://github.com/rust-lang-nursery/packed_simd"
keywords = ["simd", "vector", "portability"]
categories = ["hardware-support", "concurrency", "no-std", "data-structures"]
license = "MIT/Apache-2.0"
@@ -16,27 +16,27 @@ edition = "2018"
appveyor = { repository = "rust-lang-nursery/packed_simd" }
travis-ci = { repository = "rust-lang-nursery/packed_simd" }
codecov = { repository = "rust-lang-nursery/packed_simd" }
is-it-maintained-issue-resolution = { repository = "rust-lang-nursery/packed_simd" }
is-it-maintained-open-issues = { repository = "rust-lang-nursery/packed_simd" }
maintenance = { status = "experimental" }
[dependencies]
-cfg-if = "^0.1.6"
-core_arch = { version = "^0.1.3", optional = true }
+cfg-if = "0.1.10"
+core_arch = { version = "0.1.5", optional = true }
[features]
default = []
into_bits = []
libcore_neon = []
[dev-dependencies]
paste = "^0.1.3"
-arrayvec = { version = "^0.4", default-features = false }
+arrayvec = { version = "^0.5", default-features = false }
[target.'cfg(target_arch = "x86_64")'.dependencies.sleef-sys]
-version = "^0.1.2"
+version = "0.1.2"
optional = true
[target.wasm32-unknown-unknown.dev-dependencies]
-wasm-bindgen = "=0.2.19"
-wasm-bindgen-test = "=0.2.19"
\ No newline at end of file
+wasm-bindgen = "=0.2.52"
+wasm-bindgen-test = "=0.3.2"
diff --git a/third_party/rust/packed_simd/readme.md b/third_party/rust/packed_simd/README.md
rename from third_party/rust/packed_simd/readme.md
rename to third_party/rust/packed_simd/README.md
--- a/third_party/rust/packed_simd/readme.md
+++ b/third_party/rust/packed_simd/README.md
@@ -1,24 +1,22 @@
# `Simd<[T; N]>`
## Implementation of [Rust RFC #2366: `std::simd`][rfc2366]
[![Travis-CI Status]][travis] [![Appveyor Status]][appveyor] [![Latest Version]][crates.io] [![docs]][master_docs]
-> This aims to be a 100% conforming implementation of Rust RFC 2366 for stabilization.
-
-**WARNING**: this crate only supports the most recent nightly Rust toolchain.
+**WARNING**: this crate only supports the most recent nightly Rust toolchain
+and will be superceded by [stdsimd](https://github.com/rust-lang/stdsimd).
## Documentation
* [API docs (`master` branch)][master_docs]
* [Performance guide][perf_guide]
-* [API docs (`docs.rs`)][docs.rs]: **CURRENTLY DOWN** due to
- https://github.com/rust-lang-nursery/packed_simd/issues/110
+* [API docs (`docs.rs`)][docs.rs]
* [RFC2366 `std::simd`][rfc2366]: - contains motivation, design rationale,
discussion, etc.
## Examples
Most of the examples come with both a scalar and a vectorized implementation.
* [`aobench`](https://github.com/rust-lang-nursery/packed_simd/tree/master/examples/aobench)
@@ -34,27 +32,16 @@ Most of the examples come with both a sc
## Cargo features
* `into_bits` (default: disabled): enables `FromBits`/`IntoBits` trait
implementations for the vector types. These allow reinterpreting the bits of a
vector type as those of another vector type safely by just using the
`.into_bits()` method.
-* `core_arch` (default: disabled): enable this feature to recompile `core::arch`
- for the target-features enabled. `packed_simd` includes optimizations for some
- target feature combinations that are enabled by this feature. Note, however,
- that this is an unstable dependency, that rustc might break at any time.
-
-* `sleef-sys` (default: disabled - `x86_64` only): internally uses the [SLEEF]
- short-vector math library when profitable via the [`sleef-sys`][sleef_sys]
- crate. [SLEEF] is licensed under the [Boost Software License
- v1.0][boost_license], an extremely permissive license, and can be statically
- linked without issues.
-
## Performance
The following [ISPC] examples are also part of `packed_simd`'s
[`examples/`](https://github.com/rust-lang-nursery/packed_simd/tree/master/examples/)
directory, where `packed_simd`+[`rayon`][rayon] are used to emulate [ISPC]'s
Single-Program-Multiple-Data (SPMD) programming model. The performance results
on different hardware is shown in the `readme.md` of each example. The following
table summarizes the performance ranges, where `+` means speed-up and `-`
@@ -70,70 +57,50 @@ slowdown:
While SPMD is not the intended use case for `packed_simd`, it is possible to
combine the library with [`rayon`][rayon] to poorly emulate [ISPC]'s SPMD programming
model in Rust. Writing performant code is not as straightforward as with
[ISPC], but with some care (e.g. see the [Performance Guide][perf_guide]) one
can easily match and often out-perform [ISPC]'s "default performance".
## Platform support
-The following table describes the supported platforms: `build` shows whether the
-library compiles without issues for a given target, while `run` shows whether
-the full testsuite passes on the target.
+The following table describes the supported platforms: `build` shows whether
+the library compiles without issues for a given target, while `run` shows
+whether the test suite passes for a given target.
-| Linux targets: | build | run |
-|-----------------------------------|-----------|---------|
-| `i586-unknown-linux-gnu` | ✓ | ✓ |
-| `i686-unknown-linux-gnu` | ✓ | ✓ |
-| `x86_64-unknown-linux-gnu` | ✓ | ✓ |
-| `arm-unknown-linux-gnueabi` | ✗ | ✗ |
-| `arm-unknown-linux-gnueabihf` | ✓ | ✓ |
-| `armv7-unknown-linux-gnueabi` | ✓ | ✓ |
-| `aarch64-unknown-linux-gnu` | ✓ | ✓ |
-| `mips-unknown-linux-gnu` | ✓ | ✓ |
-| `mipsel-unknown-linux-musl` | ✓ | ✓ |
-| `mips64-unknown-linux-gnuabi64` | ✓ | ✓ |
-| `mips64el-unknown-linux-gnuabi64` | ✓ | ✓ |
-| `powerpc-unknown-linux-gnu` | ✗ | ✗ |
-| `powerpc64-unknown-linux-gnu` | ✗ | ✗ |
-| `powerpc64le-unknown-linux-gnu` | ✗ | ✗ |
-| `s390x-unknown-linux-gnu` | ✓ | ✓* |
-| `sparc64-unknown-linux-gnu` | ✓ | ✓* |
-| `thumbv7neon-unknown-linux-gnueabihf` | ✓ | ✓ |
-| **MacOSX targets:** | **build** | **run** |
-| `x86_64-apple-darwin` | ✓ | ✓ |
-| `i686-apple-darwin` | ✓ | ✓ |
-| **Windows targets:** | **build** | **run** |
-| `x86_64-pc-windows-msvc` | ✓ | ✓ |
-| `i686-pc-windows-msvc` | ✓ | ✓ |
-| `x86_64-pc-windows-gnu` | ✗ | ✗ |
-| `i686-pc-windows-gnu` | ✗ | ✗ |
-| **WebAssembly targets:** | **build** | **run** |
-| `wasm32-unknown-unknown` | ✓ | ✓ |
-| **Android targets:** | **build** | **run** |
-| `x86_64-linux-android` | ✓ | ✓ |
-| `arm-linux-androideabi` | ✓ | ✓ |
-| `aarch64-linux-android` | ✓ | ✗ |
-| `thumbv7neon-linux-androideabi` | ✓ | ✓ |
-| **iOS targets:** | **build** | **run** |
-| `i386-apple-ios` | ✓ | ✗ |
-| `x86_64-apple-ios` | ✓ | ✗ |
-| `armv7-apple-ios` | ✓ | ✗** |
-| `aarch64-apple-ios` | ✓ | ✗** |
-| **xBSD targets:** | **build** | **run** |
-| `i686-unknown-freebsd` | ✗ | ✗** |
-| `x86_64-unknown-freebsd` | ✗ | ✗** |
-| `x86_64-unknown-netbsd` | ✗ | ✗** |
-| **Solaris targets:** | **build** | **run** |
-| `x86_64-sun-solaris` | ✗ | ✗** |
+| **Linux** | **build** | **run** |
+|---------------------------------------|-----------|---------|
+| `i586-unknown-linux-gnu` | ✓ | ✗ |
+| `i686-unknown-linux-gnu` | ✓ | ✗ |
+| `x86_64-unknown-linux-gnu` | ✓ | ✓ |
+| `arm-unknown-linux-gnueabi` | ✗ | ✗ |
+| `arm-unknown-linux-gnueabihf` | ✓ | ✓ |
+| `armv7-unknown-linux-gnueabi` | ✓ | ✓ |
+| `aarch64-unknown-linux-gnu` | ✓ | ✓ |
+| `mips-unknown-linux-gnu` | ✓ | ✗ |
+| `mipsel-unknown-linux-musl` | ✓ | ✗ |
+| `mips64-unknown-linux-gnuabi64` | ✓ | ✗ |
+| `mips64el-unknown-linux-gnuabi64` | ✓ | ✗ |
+| `powerpc-unknown-linux-gnu` | ✗ | ✗ |
+| `powerpc64-unknown-linux-gnu` | ✗ | ✗ |
+| `powerpc64le-unknown-linux-gnu` | ✓ | ✓ |
+| `s390x-unknown-linux-gnu` | ✗ | ✗ |
+| `sparc64-unknown-linux-gnu` | ✓ | ✗ |
+| `thumbv7neon-unknown-linux-gnueabihf` | ✓ | ✓ |
+| **MacOSX** | **build** | **run** |
+| `x86_64-apple-darwin` | ✓ | ✓ |
+| **Android** | **build** | **run** |
+| `x86_64-linux-android` | ✓ | ✓ |
+| `arm-linux-androideabi` | ✓ | ✓ |
+| `aarch64-linux-android` | ✓ | ✓ |
+| `thumbv7neon-linux-androideabi` | ✗ | ✗ |
+| **iOS** | **build** | **run** |
+| `x86_64-apple-ios` | ✓ | ✗ |
+| `aarch64-apple-ios` | ✓ | ✗ |
-[*] most of the test suite passes correctly on these platform but
-there are correctness bugs open in the issue tracker.
-
-[**] it is currently not easily possible to run these platforms on CI.
## Machine code verification
The
[`verify/`](https://github.com/rust-lang-nursery/packed_simd/tree/master/verify)
crate tests disassembles the portable packed vector APIs at run-time and
compares the generated machine code against the desired one to make sure that
this crate remains efficient.
@@ -157,18 +124,18 @@ Please see the [contributing instruction
Contributions in any form (issues, pull requests, etc.) to this project
must adhere to Rust's [Code of Conduct].
Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in `packed_simd` by you, as defined in the Apache-2.0 license, shall be
dual licensed as above, without any additional terms or conditions.
-[travis]: https://travis-ci.org/rust-lang-nursery/packed_simd
-[Travis-CI Status]: https://travis-ci.org/rust-lang-nursery/packed_simd.svg?branch=master
+[travis]: https://travis-ci.com/rust-lang-nursery/packed_simd
+[Travis-CI Status]: https://travis-ci.com/rust-lang-nursery/packed_simd.svg?branch=master
[appveyor]: https://ci.appveyor.com/project/gnzlbg/packed-simd
[Appveyor Status]: https://ci.appveyor.com/api/projects/status/hd7v9dvr442hgdix?svg=true
[Latest Version]: https://img.shields.io/crates/v/packed_simd.svg
[crates.io]: https://crates.io/crates/packed_simd
[docs]: https://docs.rs/packed_simd/badge.svg
[docs.rs]: https://docs.rs/packed_simd/
[master_docs]: https://rust-lang-nursery.github.io/packed_simd/packed_simd/
[perf_guide]: https://rust-lang-nursery.github.io/packed_simd/perf-guide/
diff --git a/third_party/rust/packed_simd/build.rs b/third_party/rust/packed_simd/build.rs
--- a/third_party/rust/packed_simd/build.rs
+++ b/third_party/rust/packed_simd/build.rs
@@ -1,8 +1,8 @@
fn main() {
- println!("cargo:rustc-env=RUSTC_BOOTSTRAP=1");
+ println!("cargo:rustc-env=RUSTC_BOOTSTRAP=1");
let target = std::env::var("TARGET")
.expect("TARGET environment variable not defined");
if target.contains("neon") {
println!("cargo:rustc-cfg=libcore_neon");
}
}
diff --git a/third_party/rust/packed_simd/ci/all.sh b/third_party/rust/packed_simd/ci/all.sh
--- a/third_party/rust/packed_simd/ci/all.sh
+++ b/third_party/rust/packed_simd/ci/all.sh
@@ -16,17 +16,17 @@ cargo_check_fmt() {
cargo fmt --all -- --check
}
cargo_fmt() {
cargo fmt --all
}
cargo_clippy() {
- cargo clippy --all -- -D clippy::pedantic
+ cargo clippy --all -- -D clippy::perf
}
CMD="-1"
case $op in
clean*)
CMD=cargo_clean
;;
diff --git a/third_party/rust/packed_simd/ci/docker/aarch64-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/aarch64-unknown-linux-gnu/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/aarch64-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/aarch64-unknown-linux-gnu/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc \
ca-certificates \
libc6-dev \
gcc-aarch64-linux-gnu \
libc6-dev-arm64-cross \
qemu-user \
make \
diff --git a/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabi/Dockerfile b/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabi/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabi/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabi/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc \
ca-certificates \
libc6-dev \
libc6-armel-cross \
libc6-dev-armel-cross \
binutils-arm-linux-gnueabi \
gcc-arm-linux-gnueabi \
diff --git a/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile b/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc \
ca-certificates \
libc6-dev \
gcc-arm-linux-gnueabihf \
libc6-dev-armhf-cross \
qemu-user \
make \
diff --git a/third_party/rust/packed_simd/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/third_party/rust/packed_simd/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc \
ca-certificates \
libc6-dev \
gcc-arm-linux-gnueabihf \
libc6-dev-armhf-cross \
qemu-user \
make \
diff --git a/third_party/rust/packed_simd/ci/docker/i586-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/i586-unknown-linux-gnu/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/i586-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/i586-unknown-linux-gnu/Dockerfile
@@ -1,7 +1,7 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc-multilib \
libc6-dev \
file \
make \
ca-certificates
diff --git a/third_party/rust/packed_simd/ci/docker/i686-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/i686-unknown-linux-gnu/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/i686-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/i686-unknown-linux-gnu/Dockerfile
@@ -1,7 +1,7 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc-multilib \
libc6-dev \
file \
make \
ca-certificates
diff --git a/third_party/rust/packed_simd/ci/docker/mips-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/mips-unknown-linux-gnu/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/mips-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/mips-unknown-linux-gnu/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \
gcc-mips-linux-gnu libc6-dev-mips-cross \
qemu-system-mips \
qemu-user \
make \
file
diff --git a/third_party/rust/packed_simd/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile b/third_party/rust/packed_simd/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \
gcc-mips64-linux-gnuabi64 libc6-dev-mips64-cross \
qemu-system-mips64 qemu-user
ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_RUNNER="qemu-mips64 -L /usr/mips64-linux-gnuabi64" \
diff --git a/third_party/rust/packed_simd/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile b/third_party/rust/packed_simd/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \
gcc-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \
qemu-system-mips64el
ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc \
CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_RUNNER="qemu-mips64el -L /usr/mips64el-linux-gnuabi64" \
diff --git a/third_party/rust/packed_simd/ci/docker/mipsel-unknown-linux-musl/Dockerfile b/third_party/rust/packed_simd/ci/docker/mipsel-unknown-linux-musl/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/mipsel-unknown-linux-musl/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/mipsel-unknown-linux-musl/Dockerfile
@@ -11,15 +11,15 @@ RUN apt-get update && \
bzip2 \
curl \
file
RUN mkdir /toolchain
# Note that this originally came from:
# https://downloads.openwrt.org/snapshots/trunk/malta/generic/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2
-RUN curl -L https://s3-us-west-1.amazonaws.com/rust-lang-ci2/libc/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \
+RUN curl -L https://ci-mirrors.rust-lang.org/libc/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \
tar xjf - -C /toolchain --strip-components=2
ENV PATH=$PATH:/rust/bin:/toolchain/bin \
CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_LINKER=mipsel-openwrt-linux-gcc \
- CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_RUNNER="qemu-mipsel -L /toolchain"
\ No newline at end of file
+ CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_RUNNER="qemu-mipsel -L /toolchain"
diff --git a/third_party/rust/packed_simd/ci/docker/powerpc-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
@@ -1,12 +1,13 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \
gcc-powerpc-linux-gnu libc6-dev-powerpc-cross \
qemu-system-ppc \
make \
file
ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER=powerpc-linux-gnu-gcc \
CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc -cpu Vger -L /usr/powerpc-linux-gnu" \
+ CC=powerpc-linux-gnu-gcc \
OBJDUMP=powerpc-linux-gnu-objdump
diff --git a/third_party/rust/packed_simd/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc \
ca-certificates \
libc6-dev \
gcc-powerpc64-linux-gnu \
libc6-dev-ppc64-cross \
qemu-user \
diff --git a/third_party/rust/packed_simd/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \
gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross \
qemu-system-ppc file make
ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER=powerpc64le-linux-gnu-gcc \
CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64le -L /usr/powerpc64le-linux-gnu" \
diff --git a/third_party/rust/packed_simd/ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile b/third_party/rust/packed_simd/ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/thumbv7neon-unknown-linux-gnueabihf/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc \
ca-certificates \
libc6-dev \
gcc-arm-linux-gnueabihf \
libc6-dev-armhf-cross \
qemu-user \
make \
diff --git a/third_party/rust/packed_simd/ci/docker/x86_64-unknown-linux-gnu/Dockerfile b/third_party/rust/packed_simd/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
--- a/third_party/rust/packed_simd/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
+++ b/third_party/rust/packed_simd/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:17.10
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y --no-install-recommends \
gcc \
libc6-dev \
file \
make \
ca-certificates \
cmake \
libclang-dev \
diff --git a/third_party/rust/packed_simd/ci/dox.sh b/third_party/rust/packed_simd/ci/dox.sh
--- a/third_party/rust/packed_simd/ci/dox.sh
+++ b/third_party/rust/packed_simd/ci/dox.sh
@@ -13,12 +13,15 @@ cargo doc --features=into_bits
# mdbook build perf-guide -d target/doc/perf-guide
cd perf-guide
mdbook build
cd -
cp -r perf-guide/book target/doc/perf-guide
# If we're on travis, not a PR, and on the right branch, publish!
if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then
- pip install ghp_import --install-option="--prefix=$HOME/.local"
- $HOME/.local/bin/ghp-import -n target/doc
+ python3 -vV
+ pip -vV
+ python3.9 -vV
+ pip install ghp_import --user
+ ghp-import -n target/doc
git push -qf https://${GH_PAGES}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
fi
diff --git a/third_party/rust/packed_simd/ci/run.sh b/third_party/rust/packed_simd/ci/run.sh
--- a/third_party/rust/packed_simd/ci/run.sh
+++ b/third_party/rust/packed_simd/ci/run.sh
@@ -73,19 +73,21 @@ cargo_test_impl() {
# Debug run:
if [[ "${TARGET}" != "wasm32-unknown-unknown" ]]; then
# Run wasm32-unknown-unknown in release mode only
cargo_test_impl
fi
if [[ "${TARGET}" == "x86_64-unknown-linux-gnu" ]] || [[ "${TARGET}" == "x86_64-pc-windows-msvc" ]]; then
# use sleef on linux and windows x86_64 builds
- cargo_test_impl --release --features=into_bits,core_arch,sleef-sys
+ # FIXME: Use `core_arch,sleef-sys` features once they works again
+ cargo_test_impl --release --features=into_bits
else
- cargo_test_impl --release --features=into_bits,core_arch
+ # FIXME: Use `core_arch` feature once it works again
+ cargo_test_impl --release --features=into_bits
fi
# Verify code generation
if [[ "${NOVERIFY}" != "1" ]]; then
cp -r verify/verify target/verify
export STDSIMD_ASSERT_INSTR_LIMIT=30
if [[ "${TARGET}" == "i586-unknown-linux-gnu" ]]; then
export STDSIMD_ASSERT_INSTR_LIMIT=50
diff --git a/third_party/rust/packed_simd/ci/setup_benchmarks.sh b/third_party/rust/packed_simd/ci/setup_benchmarks.sh
--- a/third_party/rust/packed_simd/ci/setup_benchmarks.sh
+++ b/third_party/rust/packed_simd/ci/setup_benchmarks.sh
@@ -1,10 +1,7 @@
#!/usr/bin/env bash
set -ex
# Get latest ISPC binary for the target and put it in the path
git clone https://github.com/gnzlbg/ispc-binaries
cp ispc-binaries/ispc-${TARGET} ispc
-
-# Rust-bindgen requires RUSTFMT
-rustup component add rustfmt-preview
diff --git a/third_party/rust/packed_simd/src/api.rs b/third_party/rust/packed_simd/src/api.rs
--- a/third_party/rust/packed_simd/src/api.rs
+++ b/third_party/rust/packed_simd/src/api.rs
@@ -1,10 +1,12 @@
//! Implements the Simd<[T; N]> APIs
+#[macro_use]
+mod bitmask;
crate mod cast;
#[macro_use]
mod cmp;
#[macro_use]
mod default;
#[macro_use]
mod fmt;
#[macro_use]
@@ -34,17 +36,17 @@ mod swap_bytes;
#[macro_use]
mod bit_manip;
#[cfg(feature = "into_bits")]
crate mod into_bits;
macro_rules! impl_i {
([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident, $mask_ty:ident
- | $ielem_ty:ident | $test_tt:tt | $($elem_ids:ident),*
+ | $ielem_ty:ident, $ibitmask_ty:ident | $test_tt:tt | $($elem_ids:ident),*
| From: $($from_vec_ty:ident),* | $(#[$doc:meta])*) => {
impl_minimal_iuf!([$elem_ty; $elem_n]: $tuple_id | $ielem_ty | $test_tt
| $($elem_ids),* | $(#[$doc])*);
impl_ops_vector_arithmetic!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
impl_ops_scalar_arithmetic!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
impl_ops_vector_bitwise!(
[$elem_ty; $elem_n]: $tuple_id | $test_tt | (!(0 as $elem_ty), 0)
);
@@ -88,26 +90,27 @@ macro_rules! impl_i {
[$elem_ty; $elem_n]: $tuple_id | $test_tt | (0, 1)
);
impl_cmp_eq!([$elem_ty; $elem_n]: $tuple_id | $test_tt | (0, 1));
impl_cmp_vertical!(
[$elem_ty; $elem_n]: $tuple_id, $mask_ty, false, (1, 0) | $test_tt
);
impl_cmp_partial_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
impl_cmp_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt | (0, 1));
+ impl_bitmask!($tuple_id | $ibitmask_ty | (-1, 0) | $test_tt);
test_select!($elem_ty, $mask_ty, $tuple_id, (1, 2) | $test_tt);
test_cmp_partial_ord_int!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
test_shuffle1_dyn!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
}
}
macro_rules! impl_u {
([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident, $mask_ty:ident
- | $ielem_ty:ident | $test_tt:tt | $($elem_ids:ident),*
+ | $ielem_ty:ident, $ibitmask_ty:ident | $test_tt:tt | $($elem_ids:ident),*
| From: $($from_vec_ty:ident),* | $(#[$doc:meta])*) => {
impl_minimal_iuf!([$elem_ty; $elem_n]: $tuple_id | $ielem_ty | $test_tt
| $($elem_ids),* | $(#[$doc])*);
impl_ops_vector_arithmetic!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
impl_ops_scalar_arithmetic!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
impl_ops_vector_bitwise!(
[$elem_ty; $elem_n]: $tuple_id | $test_tt | (!(0 as $elem_ty), 0)
);
@@ -150,16 +153,18 @@ macro_rules! impl_u {
[$elem_ty; $elem_n]: $tuple_id | $test_tt | (1, 0)
);
impl_cmp_eq!([$elem_ty; $elem_n]: $tuple_id | $test_tt | (0, 1));
impl_cmp_vertical!(
[$elem_ty; $elem_n]: $tuple_id, $mask_ty, false, (1, 0) | $test_tt
);
impl_cmp_partial_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
impl_cmp_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt | (0, 1));
+ impl_bitmask!($tuple_id | $ibitmask_ty | ($ielem_ty::max_value(), 0) |
+ $test_tt);
test_select!($elem_ty, $mask_ty, $tuple_id, (1, 2) | $test_tt);
test_cmp_partial_ord_int!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
test_shuffle1_dyn!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
}
}
macro_rules! impl_f {
@@ -217,17 +222,18 @@ macro_rules! impl_f {
test_reduction_float_min_max!(
[$elem_ty; $elem_n]: $tuple_id | $test_tt
);
test_shuffle1_dyn!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
}
}
macro_rules! impl_m {
- ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident | $ielem_ty:ident
+ ([$elem_ty:ident; $elem_n:expr]: $tuple_id:ident
+ | $ielem_ty:ident, $ibitmask_ty:ident
| $test_tt:tt | $($elem_ids:ident),* | From: $($from_vec_ty:ident),*
| $(#[$doc:meta])*) => {
impl_minimal_mask!(
[$elem_ty; $elem_n]: $tuple_id | $ielem_ty | $test_tt
| $($elem_ids),* | $(#[$doc])*
);
impl_ops_vector_mask_bitwise!(
[$elem_ty; $elem_n]: $tuple_id | $test_tt | (true, false)
@@ -260,16 +266,17 @@ macro_rules! impl_m {
| $test_tt
);
impl_select!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
impl_cmp_partial_ord!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
impl_cmp_ord!(
[$elem_ty; $elem_n]: $tuple_id | $test_tt | (false, true)
);
impl_shuffle1_dyn!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
+ impl_bitmask!($tuple_id | $ibitmask_ty | (true, false) | $test_tt);
test_cmp_partial_ord_mask!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
test_shuffle1_dyn_mask!([$elem_ty; $elem_n]: $tuple_id | $test_tt);
}
}
macro_rules! impl_const_p {
([$elem_ty:ty; $elem_n:expr]: $tuple_id:ident, $mask_ty:ident,
diff --git a/third_party/rust/packed_simd/src/api/bit_manip.rs b/third_party/rust/packed_simd/src/api/bit_manip.rs
--- a/third_party/rust/packed_simd/src/api/bit_manip.rs
+++ b/third_party/rust/packed_simd/src/api/bit_manip.rs
@@ -32,16 +32,17 @@ macro_rules! impl_bit_manip {
}
}
test_if! {
$test_tt:
paste::item_with_macros! {
#[allow(overflowing_literals)]
pub mod [<$id _bit_manip>] {
+ #![allow(const_item_mutation)]
use super::*;
const LANE_WIDTH: usize = mem::size_of::<$elem_ty>() * 8;
macro_rules! test_func {
($x:expr, $func:ident) => {{
let mut actual = $x;
for i in 0..$id::lanes() {
diff --git a/third_party/rust/packed_simd/src/api/bitmask.rs b/third_party/rust/packed_simd/src/api/bitmask.rs
new file mode 100644
--- /dev/null
+++ b/third_party/rust/packed_simd/src/api/bitmask.rs
@@ -0,0 +1,82 @@
+//! Bitmask API
+
+macro_rules! impl_bitmask {
+ ($id:ident | $ibitmask_ty:ident | ($set:expr, $clear:expr)
+ | $test_tt:tt) => {
+ impl $id {
+ /// Creates a bitmask with the MSB of each vector lane.
+ ///
+ /// If the vector has less than 8 lanes, the bits that do not
+ /// correspond to any vector lanes are cleared.
+ #[inline]
+ pub fn bitmask(self) -> $ibitmask_ty {
+ unsafe { codegen::llvm::simd_bitmask(self.0) }
+ }
+ }
+
+ test_if! {
+ $test_tt:
+ paste::item! {
+ #[cfg(not(any(
+ // FIXME: https://github.com/rust-lang-nursery/packed_simd/issues/210
+ all(target_arch = "mips", target_endian = "big"),
+ all(target_arch = "mips64", target_endian = "big"),
+ target_arch = "sparc64",
+ target_arch = "s390x",
+ )))]
+ pub mod [<$id _bitmask>] {
+ use super::*;
+ #[cfg_attr(not(target_arch = "wasm32"), test)]
+ #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
+ fn bitmask() {
+ // clear all lanes
+ let vec = $id::splat($clear as _);
+ let bitmask: $ibitmask_ty = 0;
+ assert_eq!(vec.bitmask(), bitmask);
+
+ // set even lanes
+ let mut vec = $id::splat($clear as _);
+ for i in 0..$id::lanes() {
+ if i % 2 == 0 {
+ vec = vec.replace(i, $set as _);
+ }
+ }
+ // create bitmask with even lanes set:
+ let mut bitmask: $ibitmask_ty = 0;
+ for i in 0..$id::lanes() {
+ if i % 2 == 0 {
+ bitmask |= 1 << i;
+ }
+ }
+ assert_eq!(vec.bitmask(), bitmask);
+
+
+ // set odd lanes
+ let mut vec = $id::splat($clear as _);
+ for i in 0..$id::lanes() {
+ if i % 2 != 0 {
+ vec = vec.replace(i, $set as _);
+ }
+ }
+ // create bitmask with odd lanes set:
+ let mut bitmask: $ibitmask_ty = 0;
+ for i in 0..$id::lanes() {
+ if i % 2 != 0 {
+ bitmask |= 1 << i;
+ }
+ }
+ assert_eq!(vec.bitmask(), bitmask);
+
+ // set all lanes
+ let vec = $id::splat($set as _);
+ let mut bitmask: $ibitmask_ty = 0;
+ for i in 0..$id::lanes() {
+ bitmask |= 1 << i;
+ }
+ assert_eq!(vec.bitmask(), bitmask);
+ }
+ }
+ }
+ }
+ };
+}
diff --git a/third_party/rust/packed_simd/src/api/cast/v128.rs b/third_party/rust/packed_simd/src/api/cast/v128.rs
--- a/third_party/rust/packed_simd/src/api/cast/v128.rs
+++ b/third_party/rust/packed_simd/src/api/cast/v128.rs
@@ -1,10 +1,10 @@
//! `FromCast` and `IntoCast` implementations for portable 128-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
impl_from_cast!(
i8x16[test_v128]: u8x16, m8x16, i16x16, u16x16, m16x16, i32x16, u32x16, f32x16, m32x16
);
impl_from_cast!(
u8x16[test_v128]: i8x16, m8x16, i16x16, u16x16, m16x16, i32x16, u32x16, f32x16, m32x16
diff --git a/third_party/rust/packed_simd/src/api/cast/v16.rs b/third_party/rust/packed_simd/src/api/cast/v16.rs
--- a/third_party/rust/packed_simd/src/api/cast/v16.rs
+++ b/third_party/rust/packed_simd/src/api/cast/v16.rs
@@ -1,10 +1,10 @@
//! `FromCast` and `IntoCast` implementations for portable 16-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
impl_from_cast!(
i8x2[test_v16]: u8x2, m8x2, i16x2, u16x2, m16x2, i32x2, u32x2, f32x2, m32x2,
i64x2, u64x2, f64x2, m64x2, i128x2, u128x2, m128x2, isizex2, usizex2, msizex2
);
impl_from_cast!(
diff --git a/third_party/rust/packed_simd/src/api/cast/v256.rs b/third_party/rust/packed_simd/src/api/cast/v256.rs
--- a/third_party/rust/packed_simd/src/api/cast/v256.rs
+++ b/third_party/rust/packed_simd/src/api/cast/v256.rs
@@ -1,10 +1,10 @@
//! `FromCast` and `IntoCast` implementations for portable 256-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
impl_from_cast!(i8x32[test_v256]: u8x32, m8x32, i16x32, u16x32, m16x32);
impl_from_cast!(u8x32[test_v256]: i8x32, m8x32, i16x32, u16x32, m16x32);
impl_from_cast_mask!(m8x32[test_v256]: i8x32, u8x32, i16x32, u16x32, m16x32);
impl_from_cast!(
diff --git a/third_party/rust/packed_simd/src/api/cast/v32.rs b/third_party/rust/packed_simd/src/api/cast/v32.rs
--- a/third_party/rust/packed_simd/src/api/cast/v32.rs
+++ b/third_party/rust/packed_simd/src/api/cast/v32.rs
@@ -1,10 +1,10 @@
//! `FromCast` and `IntoCast` implementations for portable 32-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
impl_from_cast!(
i8x4[test_v32]: u8x4, m8x4, i16x4, u16x4, m16x4, i32x4, u32x4, f32x4, m32x4,
i64x4, u64x4, f64x4, m64x4, i128x4, u128x4, m128x4, isizex4, usizex4, msizex4
);
impl_from_cast!(
diff --git a/third_party/rust/packed_simd/src/api/cast/v512.rs b/third_party/rust/packed_simd/src/api/cast/v512.rs
--- a/third_party/rust/packed_simd/src/api/cast/v512.rs
+++ b/third_party/rust/packed_simd/src/api/cast/v512.rs
@@ -1,10 +1,10 @@
//! `FromCast` and `IntoCast` implementations for portable 512-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
impl_from_cast!(i8x64[test_v512]: u8x64, m8x64);
impl_from_cast!(u8x64[test_v512]: i8x64, m8x64);
impl_from_cast_mask!(m8x64[test_v512]: i8x64, u8x64);
impl_from_cast!(i16x32[test_v512]: i8x32, u8x32, m8x32, u16x32, m16x32);
diff --git a/third_party/rust/packed_simd/src/api/cast/v64.rs b/third_party/rust/packed_simd/src/api/cast/v64.rs
--- a/third_party/rust/packed_simd/src/api/cast/v64.rs
+++ b/third_party/rust/packed_simd/src/api/cast/v64.rs
@@ -1,10 +1,10 @@
//! `FromCast` and `IntoCast` implementations for portable 64-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
impl_from_cast!(
i8x8[test_v64]: u8x8, m8x8, i16x8, u16x8, m16x8, i32x8, u32x8, f32x8, m32x8,
i64x8, u64x8, f64x8, m64x8, isizex8, usizex8, msizex8
);
impl_from_cast!(
diff --git a/third_party/rust/packed_simd/src/api/default.rs b/third_party/rust/packed_simd/src/api/default.rs
--- a/third_party/rust/packed_simd/src/api/default.rs
+++ b/third_party/rust/packed_simd/src/api/default.rs
@@ -7,16 +7,18 @@ macro_rules! impl_default {
fn default() -> Self {
Self::splat($elem_ty::default())
}
}
test_if!{
$test_tt:
paste::item! {
+ // Comparisons use integer casts within mantissa^1 range.
+ #[allow(clippy::float_cmp)]
pub mod [<$id _default>] {
use super::*;
#[cfg_attr(not(target_arch = "wasm32"), test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn default() {
let a = $id::default();
for i in 0..$id::lanes() {
assert_eq!(a.extract(i), $elem_ty::default());
}
diff --git a/third_party/rust/packed_simd/src/api/from/from_array.rs b/third_party/rust/packed_simd/src/api/from/from_array.rs
--- a/third_party/rust/packed_simd/src/api/from/from_array.rs
+++ b/third_party/rust/packed_simd/src/api/from/from_array.rs
@@ -51,16 +51,18 @@ macro_rules! impl_from_array {
unsafe { U { array: self }.vec }
}
}
*/
test_if! {
$test_tt:
paste::item! {
+ // Comparisons use integer casts within mantissa^1 range.
+ #[allow(clippy::float_cmp)]
mod [<$id _from>] {
use super::*;
#[test]
fn array() {
let vec: $id = Default::default();
// FIXME: Workaround for arrays with more than 32
// elements.
diff --git a/third_party/rust/packed_simd/src/api/hash.rs b/third_party/rust/packed_simd/src/api/hash.rs
--- a/third_party/rust/packed_simd/src/api/hash.rs
+++ b/third_party/rust/packed_simd/src/api/hash.rs
@@ -31,16 +31,18 @@ macro_rules! impl_hash {
crate::mem::size_of::<A>(),
crate::mem::size_of::<$id>()
);
#[allow(deprecated)]
let mut a_hash = SipHasher13::new();
let mut v_hash = a_hash.clone();
a.hash(&mut a_hash);
+ // Integer within mantissa^1 range.
+ #[allow(clippy::float_cmp)]
let v = $id::splat(42 as $elem_ty);
v.hash(&mut v_hash);
assert_eq!(a_hash.finish(), v_hash.finish());
}
}
}
}
};
diff --git a/third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs b/third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs
--- a/third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs
+++ b/third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs
@@ -1,11 +1,11 @@
//! `FromBits` and `IntoBits` between portable vector types and the
//! architecture-specific vector types.
-#![rustfmt::skip]
+#[rustfmt::skip]
// FIXME: MIPS FromBits/IntoBits
#[allow(unused)]
use crate::*;
/// This macro implements FromBits for the portable and the architecture
/// specific vector types.
@@ -79,17 +79,16 @@ macro_rules! impl_arch {
}
////////////////////////////////////////////////////////////////////////////////
// Implementations for the 64-bit wide vector types:
// FIXME: 64-bit single element types
// FIXME: arm/aarch float16x4_t missing
impl_arch!(
- [x86["x86"]: __m64], [x86_64["x86_64"]: __m64],
[arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t,
poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t,
uint64x1_t],
[aarch64["aarch64"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t,
poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t, uint64x1_t,
float64x1_t] |
from: i8x8, u8x8, m8x8, i16x4, u16x4, m16x4, i32x2, u32x2, f32x2, m32x2 |
into: i8x8, u8x8, i16x4, u16x4, i32x2, u32x2, f32x2 |
diff --git a/third_party/rust/packed_simd/src/api/into_bits/v128.rs b/third_party/rust/packed_simd/src/api/into_bits/v128.rs
--- a/third_party/rust/packed_simd/src/api/into_bits/v128.rs
+++ b/third_party/rust/packed_simd/src/api/into_bits/v128.rs
@@ -1,10 +1,10 @@
//! `FromBits` and `IntoBits` implementations for portable 128-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
#[allow(unused)] // wasm_bindgen_test
use crate::*;
impl_from_bits!(i8x16[test_v128]: u8x16, m8x16, i16x8, u16x8, m16x8, i32x4, u32x4, f32x4, m32x4, i64x2, u64x2, f64x2, m64x2, i128x1, u128x1, m128x1);
impl_from_bits!(u8x16[test_v128]: i8x16, m8x16, i16x8, u16x8, m16x8, i32x4, u32x4, f32x4, m32x4, i64x2, u64x2, f64x2, m64x2, i128x1, u128x1, m128x1);
impl_from_bits!(m8x16[test_v128]: m16x8, m32x4, m64x2, m128x1);
diff --git a/third_party/rust/packed_simd/src/api/into_bits/v16.rs b/third_party/rust/packed_simd/src/api/into_bits/v16.rs
--- a/third_party/rust/packed_simd/src/api/into_bits/v16.rs
+++ b/third_party/rust/packed_simd/src/api/into_bits/v16.rs
@@ -1,9 +1,9 @@
//! `FromBits` and `IntoBits` implementations for portable 16-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
#[allow(unused)] // wasm_bindgen_test
use crate::*;
impl_from_bits!(i8x2[test_v16]: u8x2, m8x2);
impl_from_bits!(u8x2[test_v16]: i8x2, m8x2);
// note: m8x2 cannot be constructed from all i8x2 or u8x2 bit patterns
diff --git a/third_party/rust/packed_simd/src/api/into_bits/v256.rs b/third_party/rust/packed_simd/src/api/into_bits/v256.rs
--- a/third_party/rust/packed_simd/src/api/into_bits/v256.rs
+++ b/third_party/rust/packed_simd/src/api/into_bits/v256.rs
@@ -1,10 +1,10 @@
//! `FromBits` and `IntoBits` implementations for portable 256-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
#[allow(unused)] // wasm_bindgen_test
use crate::*;
impl_from_bits!(i8x32[test_v256]: u8x32, m8x32, i16x16, u16x16, m16x16, i32x8, u32x8, f32x8, m32x8, i64x4, u64x4, f64x4, m64x4, i128x2, u128x2, m128x2);
impl_from_bits!(u8x32[test_v256]: i8x32, m8x32, i16x16, u16x16, m16x16, i32x8, u32x8, f32x8, m32x8, i64x4, u64x4, f64x4, m64x4, i128x2, u128x2, m128x2);
impl_from_bits!(m8x32[test_v256]: m16x16, m32x8, m64x4, m128x2);
diff --git a/third_party/rust/packed_simd/src/api/into_bits/v32.rs b/third_party/rust/packed_simd/src/api/into_bits/v32.rs
--- a/third_party/rust/packed_simd/src/api/into_bits/v32.rs
+++ b/third_party/rust/packed_simd/src/api/into_bits/v32.rs
@@ -1,10 +1,10 @@
//! `FromBits` and `IntoBits` implementations for portable 32-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
#[allow(unused)] // wasm_bindgen_test
use crate::*;
impl_from_bits!(i8x4[test_v32]: u8x4, m8x4, i16x2, u16x2, m16x2);
impl_from_bits!(u8x4[test_v32]: i8x4, m8x4, i16x2, u16x2, m16x2);
impl_from_bits!(m8x4[test_v32]: m16x2);
diff --git a/third_party/rust/packed_simd/src/api/into_bits/v512.rs b/third_party/rust/packed_simd/src/api/into_bits/v512.rs
--- a/third_party/rust/packed_simd/src/api/into_bits/v512.rs
+++ b/third_party/rust/packed_simd/src/api/into_bits/v512.rs
@@ -1,10 +1,10 @@
//! `FromBits` and `IntoBits` implementations for portable 512-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
#[allow(unused)] // wasm_bindgen_test
use crate::*;
impl_from_bits!(i8x64[test_v512]: u8x64, m8x64, i16x32, u16x32, m16x32, i32x16, u32x16, f32x16, m32x16, i64x8, u64x8, f64x8, m64x8, i128x4, u128x4, m128x4);
impl_from_bits!(u8x64[test_v512]: i8x64, m8x64, i16x32, u16x32, m16x32, i32x16, u32x16, f32x16, m32x16, i64x8, u64x8, f64x8, m64x8, i128x4, u128x4, m128x4);
impl_from_bits!(m8x64[test_v512]: m16x32, m32x16, m64x8, m128x4);
diff --git a/third_party/rust/packed_simd/src/api/into_bits/v64.rs b/third_party/rust/packed_simd/src/api/into_bits/v64.rs
--- a/third_party/rust/packed_simd/src/api/into_bits/v64.rs
+++ b/third_party/rust/packed_simd/src/api/into_bits/v64.rs
@@ -1,10 +1,10 @@
//! `FromBits` and `IntoBits` implementations for portable 64-bit wide vectors
-#![rustfmt::skip]
+#[rustfmt::skip]
#[allow(unused)] // wasm_bindgen_test
use crate::*;
impl_from_bits!(i8x8[test_v64]: u8x8, m8x8, i16x4, u16x4, m16x4, i32x2, u32x2, f32x2, m32x2);
impl_from_bits!(u8x8[test_v64]: i8x8, m8x8, i16x4, u16x4, m16x4, i32x2, u32x2, f32x2, m32x2);
impl_from_bits!(m8x8[test_v64]: m16x4, m32x2);
diff --git a/third_party/rust/packed_simd/src/api/minimal/iuf.rs b/third_party/rust/packed_simd/src/api/minimal/iuf.rs
--- a/third_party/rust/packed_simd/src/api/minimal/iuf.rs
+++ b/third_party/rust/packed_simd/src/api/minimal/iuf.rs
@@ -48,17 +48,17 @@ macro_rules! impl_minimal_iuf {
#[inline]
pub fn extract(self, index: usize) -> $elem_ty {
assert!(index < $elem_count);
unsafe { self.extract_unchecked(index) }
}
/// Extracts the value at `index`.
///
- /// # Precondition
+ /// # Safety
///
/// If `index >= Self::lanes()` the behavior is undefined.
#[inline]
pub unsafe fn extract_unchecked(self, index: usize) -> $elem_ty {
use crate::llvm::simd_extract;
let e: $ielem_ty = simd_extract(self.0, index as u32);
e as $elem_ty
}
@@ -75,17 +75,17 @@ macro_rules! impl_minimal_iuf {
]
pub fn replace(self, index: usize, new_value: $elem_ty) -> Self {
assert!(index < $elem_count);
unsafe { self.replace_unchecked(index, new_value) }
}
/// Returns a new vector where the value at `index` is replaced by `new_value`.
///
- /// # Precondition
+ /// # Safety
///
/// If `index >= Self::lanes()` the behavior is undefined.
#[inline]
#[must_use = "replace_unchecked does not modify the original value - \
it returns a new vector with the value at `index` \
replaced by `new_value`d"
]
pub unsafe fn replace_unchecked(
@@ -96,16 +96,18 @@ macro_rules! impl_minimal_iuf {
use crate::llvm::simd_insert;
Simd(simd_insert(self.0, index as u32, new_value as $ielem_ty))
}
}
test_if!{
$test_tt:
paste::item! {
+ // Comparisons use integer casts within mantissa^1 range.
+ #[allow(clippy::float_cmp)]
pub mod [<$id _minimal>] {
use super::*;
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn minimal() {
// lanes:
assert_eq!($elem_count, $id::lanes());
diff --git a/third_party/rust/packed_simd/src/api/minimal/mask.rs b/third_party/rust/packed_simd/src/api/minimal/mask.rs
--- a/third_party/rust/packed_simd/src/api/minimal/mask.rs
+++ b/third_party/rust/packed_simd/src/api/minimal/mask.rs
@@ -53,16 +53,18 @@ macro_rules! impl_minimal_mask {
#[inline]
pub fn extract(self, index: usize) -> bool {
assert!(index < $elem_count);
unsafe { self.extract_unchecked(index) }
}
/// Extracts the value at `index`.
///
+ /// # Safety
+ ///
/// If `index >= Self::lanes()` the behavior is undefined.
#[inline]
pub unsafe fn extract_unchecked(self, index: usize) -> bool {
use crate::llvm::simd_extract;
let x: $ielem_ty = simd_extract(self.0, index as u32);
x != 0
}
@@ -80,19 +82,19 @@ macro_rules! impl_minimal_mask {
pub fn replace(self, index: usize, new_value: bool) -> Self {
assert!(index < $elem_count);
unsafe { self.replace_unchecked(index, new_value) }
}
/// Returns a new vector where the value at `index` is replaced by
/// `new_value`.
///
- /// # Panics
+ /// # Safety
///
- /// If `index >= Self::lanes()`.
+ /// If `index >= Self::lanes()` the behavior is undefined.
#[inline]
#[must_use = "replace_unchecked does not modify the original value - \
it returns a new vector with the value at `index` \
replaced by `new_value`d"
]
pub unsafe fn replace_unchecked(
self,
index: usize,
diff --git a/third_party/rust/packed_simd/src/api/minimal/ptr.rs b/third_party/rust/packed_simd/src/api/minimal/ptr.rs
--- a/third_party/rust/packed_simd/src/api/minimal/ptr.rs
+++ b/third_party/rust/packed_simd/src/api/minimal/ptr.rs
@@ -63,17 +63,17 @@ macro_rules! impl_minimal_p {
#[inline]
pub fn extract(self, index: usize) -> $elem_ty {
assert!(index < $elem_count);
unsafe { self.extract_unchecked(index) }
}
/// Extracts the value at `index`.
///
- /// # Precondition
+ /// # Safety
///
/// If `index >= Self::lanes()` the behavior is undefined.
#[inline]
pub unsafe fn extract_unchecked(self, index: usize) -> $elem_ty {
use crate::llvm::simd_extract;
simd_extract(self.0, index as u32)
}
@@ -91,17 +91,17 @@ macro_rules! impl_minimal_p {
#[allow(clippy::not_unsafe_ptr_arg_deref)]
pub fn replace(self, index: usize, new_value: $elem_ty) -> Self {
assert!(index < $elem_count);
unsafe { self.replace_unchecked(index, new_value) }
}
/// Returns a new vector where the value at `index` is replaced by `new_value`.
///
- /// # Precondition
+ /// # Safety
///
/// If `index >= Self::lanes()` the behavior is undefined.
#[inline]
#[must_use = "replace_unchecked does not modify the original value - \
it returns a new vector with the value at `index` \
replaced by `new_value`d"
]
pub unsafe fn replace_unchecked(
@@ -210,17 +210,17 @@ macro_rules! impl_minimal_p {
impl<T> crate::fmt::Debug for $id<T> {
#[allow(clippy::missing_inline_in_public_items)]
fn fmt(&self, f: &mut crate::fmt::Formatter<'_>)
-> crate::fmt::Result {
write!(
f,
"{}<{}>(",
stringify!($id),
- unsafe { crate::intrinsics::type_name::<T>() }
+ crate::intrinsics::type_name::<T>()
)?;
for i in 0..$elem_count {
if i > 0 {
write!(f, ", ")?;
}
self.extract(i).fmt(f)?;
}
write!(f, ")")
@@ -545,21 +545,17 @@ macro_rules! impl_minimal_p {
let values = [1_i32; $elem_count];
let mut vec: $id<i32> = Default::default();
let mut array = [
$id::<i32>::null().extract(0); $elem_count
];
for i in 0..$elem_count {
- let ptr = unsafe {
- crate::mem::transmute(
- &values[i] as *const i32
- )
- };
+ let ptr = &values[i] as *const i32 as *mut i32;
vec = vec.replace(i, ptr);
array[i] = ptr;
}
// FIXME: there is no impl of From<$id<T>> for [$elem_ty; N]
// let a0 = From::from(vec);
// assert_eq!(a0, array);
#[allow(unused_assignments)]
@@ -606,30 +602,30 @@ macro_rules! impl_minimal_p {
unsafe {
assert!(slice.len() >= $elem_count);
Self::from_slice_unaligned_unchecked(slice)
}
}
/// Instantiates a new vector with the values of the `slice`.
///
- /// # Precondition
+ /// # Safety
///
/// If `slice.len() < Self::lanes()` or `&slice[0]` is not aligned
/// to an `align_of::<Self>()` boundary, the behavior is undefined.
#[inline]
pub unsafe fn from_slice_aligned_unchecked(slice: &[$elem_ty])
-> Self {
#[allow(clippy::cast_ptr_alignment)]
*(slice.get_unchecked(0) as *const $elem_ty as *const Self)
}
/// Instantiates a new vector with the values of the `slice`.
///
- /// # Precondition
+ /// # Safety
///
/// If `slice.len() < Self::lanes()` the behavior is undefined.
#[inline]
pub unsafe fn from_slice_unaligned_unchecked(
slice: &[$elem_ty],
) -> Self {
use crate::mem::size_of;
let target_ptr =
@@ -822,33 +818,33 @@ macro_rules! impl_minimal_p {
unsafe {
assert!(slice.len() >= $elem_count);
self.write_to_slice_unaligned_unchecked(slice);
}
}
/// Writes the values of the vector to the `slice`.
///
- /// # Precondition
+ /// # Safety
///
/// If `slice.len() < Self::lanes()` or `&slice[0]` is not
/// aligned to an `align_of::<Self>()` boundary, the behavior is
/// undefined.
#[inline]
pub unsafe fn write_to_slice_aligned_unchecked(
self, slice: &mut [$elem_ty],
) {
#[allow(clippy::cast_ptr_alignment)]
*(slice.get_unchecked_mut(0) as *mut $elem_ty as *mut Self) =
self;
}
/// Writes the values of the vector to the `slice`.
///
- /// # Precondition
+ /// # Safety
///
/// If `slice.len() < Self::lanes()` the behavior is undefined.
#[inline]
pub unsafe fn write_to_slice_unaligned_unchecked(
self, slice: &mut [$elem_ty],
) {
let target_ptr =
slice.get_unchecked_mut(0) as *mut $elem_ty as *mut u8;
@@ -1020,21 +1016,17 @@ macro_rules! impl_minimal_p {
let mut vec: $id<i32> = Default::default();
let mut array = [
$id::<i32>::null().extract(0);
$elem_count
];
for i in 0..$elem_count {
- let ptr = unsafe {
- crate::mem::transmute(
- &values[i] as *const i32
- )
- };
+ let ptr = &values[i] as *const i32 as *mut i32;
vec = vec.replace(i, ptr);
array[i] = ptr;
}
#[allow(deprecated)]
let mut a_hash = SipHasher13::new();
let mut v_hash = a_hash.clone();
array.hash(&mut a_hash);
@@ -1146,17 +1138,17 @@ macro_rules! impl_minimal_p {
/// allocation. For instance, no known 64-bit platform can ever
/// serve a request for 263 bytes due to page-table limitations or
/// splitting the address space. However, some 32-bit and 16-bit
/// platforms may successfully serve a request for more than
/// `isize::MAX` bytes with things like Physical Address Extension.
/// As such, memory acquired directly from allocators or memory
/// mapped files may be too large to handle with this function.
///
- /// Consider using wrapping_offset_from instead if these constraints
+ /// Consider using `wrapping_offset_from` instead if these constraints
/// are difficult to satisfy. The only advantage of this method is
/// that it enables more aggressive compiler optimizations.
#[inline]
pub unsafe fn offset_from(self, origin: Self) -> $isize_ty {
// FIXME: should use LLVM's `sub nsw nuw`.
self.wrapping_offset_from(origin)
}
diff --git a/third_party/rust/packed_simd/src/api/ops/vector_float_min_max.rs b/third_party/rust/packed_simd/src/api/ops/vector_float_min_max.rs
--- a/third_party/rust/packed_simd/src/api/ops/vector_float_min_max.rs
+++ b/third_party/rust/packed_simd/src/api/ops/vector_float_min_max.rs
@@ -21,16 +21,21 @@ macro_rules! impl_ops_vector_float_min_m
pub fn max(self, x: Self) -> Self {
use crate::llvm::simd_fmax;
unsafe { Simd(simd_fmax(self.0, x.0)) }
}
}
test_if!{
$test_tt:
paste::item! {
+ #[cfg(not(any(
+ // FIXME: https://github.com/rust-lang-nursery/packed_simd/issues/223
+ all(target_arch = "mips", target_endian = "big"),
+ target_arch = "mips64",
+ )))]
pub mod [<$id _ops_vector_min_max>] {
use super::*;
#[cfg_attr(not(target_arch = "wasm32"), test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn min_max() {
let n = crate::$elem_ty::NAN;
let o = $id::splat(1. as $elem_ty);
let t = $id::splat(2. as $elem_ty);
diff --git a/third_party/rust/packed_simd/src/api/ptr/gather_scatter.rs b/third_party/rust/packed_simd/src/api/ptr/gather_scatter.rs
--- a/third_party/rust/packed_simd/src/api/ptr/gather_scatter.rs
+++ b/third_party/rust/packed_simd/src/api/ptr/gather_scatter.rs
@@ -44,19 +44,19 @@ macro_rules! impl_ptr_read {
let mut v = [0_i32; $elem_count];
for i in 0..$elem_count {
v[i] = i as i32;
}
let mut ptr = $id::<i32>::null();
for i in 0..$elem_count {
- ptr = ptr.replace(i, unsafe {
- crate::mem::transmute(&v[i] as *const i32)
- });
+ ptr = ptr.replace(i,
+ &v[i] as *const i32 as *mut i32
+ );
}
// all mask elements are true:
let mask = $mask_ty::splat(true);
let def = Simd::<[i32; $elem_count]>::splat(42_i32);
let r: Simd<[i32; $elem_count]> = unsafe {
ptr.read(mask, def)
};
@@ -130,42 +130,18 @@ macro_rules! impl_ptr_write {
#[inline]
pub unsafe fn write<M>(
self, mask: Simd<[M; $elem_count]>,
value: Simd<[T; $elem_count]>,
) where
M: sealed::Mask,
[M; $elem_count]: sealed::SimdArray,
{
- // FIXME:
- // https://github.com/rust-lang-nursery/packed_simd/issues/85
- #[cfg(not(target_arch = "mips"))]
- {
- use crate::llvm::simd_scatter;
- simd_scatter(value.0, self.0, mask.0)
- }
- #[cfg(target_arch = "mips")]
- {
- let m_ptr =
- &mask as *const Simd<[M; $elem_count]> as *const M;
- for i in 0..$elem_count {
- let m = ptr::read(m_ptr.add(i));
- if m.test() {
- let t_ptr = &self
- as *const Simd<[*mut T; $elem_count]>
- as *mut *mut T;
- let v_ptr = &value as *const Simd<[T; $elem_count]>
- as *const T;
- ptr::write(
- ptr::read(t_ptr.add(i)),
- ptr::read(v_ptr.add(i)),
- );
- }
- }
- }
+ use crate::llvm::simd_scatter;
+ simd_scatter(value.0, self.0, mask.0)
}
}
test_if! {
$test_tt:
paste::item! {
mod [<$id _write>] {
use super::*;
@@ -180,17 +156,17 @@ macro_rules! impl_ptr_write {
for i in 0..$elem_count {
arr[i] = i as i32;
}
// arr = [0, 1, 2, ...]
let mut ptr = $id::<i32>::null();
for i in 0..$elem_count {
ptr = ptr.replace(i, unsafe {
- crate::mem::transmute(arr.as_ptr().add(i))
+ arr.as_ptr().add(i) as *mut i32
});
}
// ptr = [&arr[0], &arr[1], ...]
// write `fourty_two` to all elements of `v`
{
let backup = arr;
unsafe {
diff --git a/third_party/rust/packed_simd/src/api/reductions/float_arithmetic.rs b/third_party/rust/packed_simd/src/api/reductions/float_arithmetic.rs
--- a/third_party/rust/packed_simd/src/api/reductions/float_arithmetic.rs
+++ b/third_party/rust/packed_simd/src/api/reductions/float_arithmetic.rs
@@ -88,16 +88,18 @@ macro_rules! impl_reduction_float_arithm
fn product<I: Iterator<Item = &'a $id>>(iter: I) -> $id {
iter.fold($id::splat(1.), |a, b| crate::ops::Mul::mul(a, *b))
}
}
test_if! {
$test_tt:
paste::item! {
+ // Comparisons use integer casts within mantissa^1 range.
+ #[allow(clippy::float_cmp)]
pub mod [<$id _reduction_float_arith>] {
use super::*;
fn alternating(x: usize) -> $id {
let mut v = $id::splat(1 as $elem_ty);
for i in 0..$id::lanes() {
if i % x == 0 {
v = v.replace(i, 2 as $elem_ty);
}
@@ -220,17 +222,17 @@ macro_rules! impl_reduction_float_arithm
}
let mut start = crate::$elem_ty::EPSILON;
let mut scalar_reduction = 0. as $elem_ty;
let mut v = $id::splat(0. as $elem_ty);
for i in 0..$id::lanes() {
let c = if i % 2 == 0 { 1e3 } else { -1. };
- start *= 3.14 * c;
+ start *= ::core::$elem_ty::consts::PI * c;
scalar_reduction += start;
v = v.replace(i, start);
}
let simd_reduction = v.sum();
let mut a = [0. as $elem_ty; $id::lanes()];
v.write_to_slice_unaligned(&mut a);
let tree_reduction = tree_reduce_sum(&a);
@@ -252,16 +254,17 @@ macro_rules! impl_reduction_float_arithm
scalar_reduction
);
}
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
#[allow(unused, dead_code)]
fn product_roundoff() {
+ use ::core::convert::TryInto;
// Performs a tree-reduction
fn tree_reduce_product(a: &[$elem_ty]) -> $elem_ty {
assert!(!a.is_empty());
if a.len() == 1 {
a[0]
} else if a.len() == 2 {
a[0] * a[1]
} else {
@@ -273,35 +276,37 @@ macro_rules! impl_reduction_float_arithm
}
let mut start = crate::$elem_ty::EPSILON;
let mut scalar_reduction = 1. as $elem_ty;
let mut v = $id::splat(0. as $elem_ty);
for i in 0..$id::lanes() {
let c = if i % 2 == 0 { 1e3 } else { -1. };
- start *= 3.14 * c;
+ start *= ::core::$elem_ty::consts::PI * c;
scalar_reduction *= start;
v = v.replace(i, start);
}
let simd_reduction = v.product();
let mut a = [0. as $elem_ty; $id::lanes()];
v.write_to_slice_unaligned(&mut a);
let tree_reduction = tree_reduce_product(&a);
- // tolerate 1 ULP difference:
+ // FIXME: Too imprecise, even only for product(f32x8).
+ // Figure out how to narrow this down.
+ let ulp_limit = $id::lanes() / 2;
let red_bits = simd_reduction.to_bits();
let tree_bits = tree_reduction.to_bits();
assert!(
if red_bits > tree_bits {
red_bits - tree_bits
} else {
tree_bits - red_bits
- } < 2,
+ } < ulp_limit.try_into().unwrap(),
"vector: {:?} | simd_reduction: {:?} | \
tree_reduction: {} | scalar_reduction: {}",
v,
simd_reduction,
tree_reduction,
scalar_reduction
);
}
diff --git a/third_party/rust/packed_simd/src/api/reductions/min_max.rs b/third_party/rust/packed_simd/src/api/reductions/min_max.rs
--- a/third_party/rust/packed_simd/src/api/reductions/min_max.rs
+++ b/third_party/rust/packed_simd/src/api/reductions/min_max.rs
@@ -71,16 +71,18 @@ macro_rules! impl_reduction_min_max {
x = x.min(self.extract(i));
}
x
}
}
}
test_if! {$test_tt:
paste::item! {
+ // Comparisons use integer casts within mantissa^1 range.
+ #[allow(clippy::float_cmp)]
pub mod [<$id _reduction_min_max>] {
use super::*;
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
pub fn max_element() {
let v = $id::splat(0 as $elem_ty);
assert_eq!(v.max_element(), 0 as $elem_ty);
if $id::lanes() > 1 {
@@ -119,16 +121,18 @@ macro_rules! impl_reduction_min_max {
};
}
macro_rules! test_reduction_float_min_max {
([$elem_ty:ident; $elem_count:expr]: $id:ident | $test_tt:tt) => {
test_if!{
$test_tt:
paste::item! {
+ // Comparisons use integer casts within mantissa^1 range.
+ #[allow(clippy::float_cmp)]
pub mod [<$id _reduction_min_max_nan>] {
use super::*;
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn min_element_test() {
let n = crate::$elem_ty::NAN;
assert_eq!(n.min(-3.), -3.);
diff --git a/third_party/rust/packed_simd/src/api/slice/from_slice.rs b/third_party/rust/packed_simd/src/api/slice/from_slice.rs
--- a/third_party/rust/packed_simd/src/api/slice/from_slice.rs
+++ b/third_party/rust/packed_simd/src/api/slice/from_slice.rs
@@ -33,17 +33,17 @@ macro_rules! impl_slice_from_slice {
unsafe {
assert!(slice.len() >= $elem_count);
Self::from_slice_unaligned_unchecked(slice)
}
}
/// Instantiates a new vector with the values of the `slice`.
///
- /// # Precondition
+ /// # Safety
///
/// If `slice.len() < Self::lanes()` or `&slice[0]` is not aligned
/// to an `align_of::<Self>()` boundary, the behavior is undefined.
#[inline]
pub unsafe fn from_slice_aligned_unchecked(
slice: &[$elem_ty],
) -> Self {
debug_assert!(slice.len() >= $elem_count);
@@ -54,17 +54,17 @@ macro_rules! impl_slice_from_slice {
);
#[allow(clippy::cast_ptr_alignment)]
*(target_ptr as *const Self)
}
/// Instantiates a new vector with the values of the `slice`.
///
- /// # Precondition
+ /// # Safety
///
/// If `slice.len() < Self::lanes()` the behavior is undefined.
#[inline]
pub unsafe fn from_slice_unaligned_unchecked(
slice: &[$elem_ty],
) -> Self {
use crate::mem::size_of;
debug_assert!(slice.len() >= $elem_count);
@@ -79,16 +79,18 @@ macro_rules! impl_slice_from_slice {
);
x
}
}
test_if! {
$test_tt:
paste::item! {
+ // Comparisons use integer casts within mantissa^1 range.
+ #[allow(clippy::float_cmp)]
pub mod [<$id _slice_from_slice>] {
use super::*;
use crate::iter::Iterator;
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn from_slice_unaligned() {
let mut unaligned = [42 as $elem_ty; $id::lanes() + 1];
diff --git a/third_party/rust/packed_simd/src/api/slice/write_to_slice.rs b/third_party/rust/packed_simd/src/api/slice/write_to_slice.rs
--- a/third_party/rust/packed_simd/src/api/slice/write_to_slice.rs
+++ b/third_party/rust/packed_simd/src/api/slice/write_to_slice.rs
@@ -34,17 +34,17 @@ macro_rules! impl_slice_write_to_slice {
unsafe {
assert!(slice.len() >= $elem_count);
self.write_to_slice_unaligned_unchecked(slice);
}
}
/// Writes the values of the vector to the `slice`.
///
- /// # Precondition
+ /// # Safety
///
/// If `slice.len() < Self::lanes()` or `&slice[0]` is not
/// aligned to an `align_of::<Self>()` boundary, the behavior is
/// undefined.
#[inline]
pub unsafe fn write_to_slice_aligned_unchecked(
self, slice: &mut [$elem_ty],
) {
@@ -59,17 +59,17 @@ macro_rules! impl_slice_write_to_slice {
#[allow(clippy::cast_ptr_alignment)]
#[allow(clippy::cast_ptr_alignment)]
#[allow(clippy::cast_ptr_alignment)]
*(target_ptr as *mut Self) = self;
}
/// Writes the values of the vector to the `slice`.
///
- /// # Precondition
+ /// # Safety
///
/// If `slice.len() < Self::lanes()` the behavior is undefined.
#[inline]
pub unsafe fn write_to_slice_unaligned_unchecked(
self, slice: &mut [$elem_ty],
) {
debug_assert!(slice.len() >= $elem_count);
let target_ptr =
@@ -81,16 +81,18 @@ macro_rules! impl_slice_write_to_slice {
crate::mem::size_of::<Self>(),
);
}
}
test_if! {
$test_tt:
paste::item! {
+ // Comparisons use integer casts within mantissa^1 range.
+ #[allow(clippy::float_cmp)]
pub mod [<$id _slice_write_to_slice>] {
use super::*;
use crate::iter::Iterator;
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn write_to_slice_unaligned() {
let mut unaligned = [0 as $elem_ty; $id::lanes() + 1];
diff --git a/third_party/rust/packed_simd/src/codegen.rs b/third_party/rust/packed_simd/src/codegen.rs
--- a/third_party/rust/packed_simd/src/codegen.rs
+++ b/third_party/rust/packed_simd/src/codegen.rs
@@ -11,23 +11,26 @@ crate mod swap_bytes;
macro_rules! impl_simd_array {
([$elem_ty:ident; $elem_count:expr]:
$tuple_id:ident | $($elem_tys:ident),*) => {
#[derive(Copy, Clone)]
#[repr(simd)]
pub struct $tuple_id($(crate $elem_tys),*);
//^^^^^^^ leaked through SimdArray
+ impl crate::sealed::Seal for [$elem_ty; $elem_count] {}
+
impl crate::sealed::SimdArray for [$elem_ty; $elem_count] {
type Tuple = $tuple_id;
type T = $elem_ty;
const N: usize = $elem_count;
type NT = [u32; $elem_count];
}
+ impl crate::sealed::Seal for $tuple_id {}
impl crate::sealed::Simd for $tuple_id {
type Element = $elem_ty;
const LANES: usize = $elem_count;
type LanesType = [u32; $elem_count];
}
}
}
diff --git a/third_party/rust/packed_simd/src/codegen/bit_manip.rs b/third_party/rust/packed_simd/src/codegen/bit_manip.rs
--- a/third_party/rust/packed_simd/src/codegen/bit_manip.rs
+++ b/third_party/rust/packed_simd/src/codegen/bit_manip.rs
@@ -1,10 +1,10 @@
//! LLVM bit manipulation intrinsics.
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
#[allow(improper_ctypes, dead_code)]
extern "C" {
#[link_name = "llvm.ctlz.v2i8"]
fn ctlz_u8x2(x: u8x2, is_zero_undef: bool) -> u8x2;
#[link_name = "llvm.ctlz.v4i8"]
diff --git a/third_party/rust/packed_simd/src/codegen/llvm.rs b/third_party/rust/packed_simd/src/codegen/llvm.rs
--- a/third_party/rust/packed_simd/src/codegen/llvm.rs
+++ b/third_party/rust/packed_simd/src/codegen/llvm.rs
@@ -5,41 +5,47 @@ use crate::sealed::Shuffle;
#[allow(unused_imports)] // FIXME: spurious warning?
use crate::sealed::Simd;
// Shuffle intrinsics: expanded in users' crates, therefore public.
extern "platform-intrinsic" {
// FIXME: Passing this intrinsics an `idx` array with an index that is
// out-of-bounds will produce a monomorphization-time error.
// https://github.com/rust-lang-nursery/packed_simd/issues/21
+ #[rustc_args_required_const(2)]
pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U
where
T: Simd,
<T as Simd>::Element: Shuffle<[u32; 2], Output = U>;
+ #[rustc_args_required_const(2)]
pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U
where
T: Simd,
<T as Simd>::Element: Shuffle<[u32; 4], Output = U>;
+ #[rustc_args_required_const(2)]
pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U
where
T: Simd,
<T as Simd>::Element: Shuffle<[u32; 8], Output = U>;
+ #[rustc_args_required_const(2)]
pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U
where
T: Simd,
<T as Simd>::Element: Shuffle<[u32; 16], Output = U>;
+ #[rustc_args_required_const(2)]
pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U
where
T: Simd,
<T as Simd>::Element: Shuffle<[u32; 32], Output = U>;
+ #[rustc_args_required_const(2)]
pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U
where
T: Simd,
<T as Simd>::Element: Shuffle<[u32; 64], Output = U>;
}
pub use self::simd_shuffle16 as __shuffle_vector16;
pub use self::simd_shuffle2 as __shuffle_vector2;
@@ -91,9 +97,11 @@ extern "platform-intrinsic" {
crate fn simd_fmin<T>(a: T, b: T) -> T;
crate fn simd_fmax<T>(a: T, b: T) -> T;
crate fn simd_fsqrt<T>(a: T) -> T;
crate fn simd_fma<T>(a: T, b: T, c: T) -> T;
crate fn simd_gather<T, P, M>(value: T, pointers: P, mask: M) -> T;
crate fn simd_scatter<T, P, M>(value: T, pointers: P, mask: M);
+
+ crate fn simd_bitmask<T, U>(value: T) -> U;
}
diff --git a/third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs
--- a/third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs
+++ b/third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs
@@ -14,23 +14,17 @@ mod avx;
#[cfg(target_feature = "avx2")]
#[macro_use]
mod avx2;
/// x86 64-bit m8x8 implementation
macro_rules! x86_m8x8_impl {
($id:ident) => {
- cfg_if! {
- if #[cfg(all(target_arch = "x86_64", target_feature = "sse"))] {
- x86_m8x8_sse_impl!($id);
- } else {
- fallback_impl!($id);
- }
- }
+ fallback_impl!($id);
};
}
/// x86 128-bit m8x16 implementation
macro_rules! x86_m8x16_impl {
($id:ident) => {
cfg_if! {
if #[cfg(target_feature = "sse2")] {
diff --git a/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs b/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs
--- a/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs
+++ b/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs
@@ -29,40 +29,8 @@ macro_rules! x86_m32x4_sse_impl {
#[cfg(target_arch = "x86_64")]
use crate::arch::x86_64::_mm_movemask_ps;
_mm_movemask_ps(crate::mem::transmute(self)) != 0
}
}
};
}
-
-macro_rules! x86_m8x8_sse_impl {
- ($id:ident) => {
- impl All for $id {
- #[inline]
- #[target_feature(enable = "sse")]
- unsafe fn all(self) -> bool {
- #[cfg(target_arch = "x86")]
- use crate::arch::x86::_mm_movemask_pi8;
- #[cfg(target_arch = "x86_64")]
- use crate::arch::x86_64::_mm_movemask_pi8;
- // _mm_movemask_pi8(a) creates an 8bit mask containing the most
- // significant bit of each byte of `a`. If all bits are set,
- // then all 8 lanes of the mask are true.
- _mm_movemask_pi8(crate::mem::transmute(self))
- == u8::max_value() as i32
- }
- }
- impl Any for $id {
- #[inline]
- #[target_feature(enable = "sse")]
- unsafe fn any(self) -> bool {
- #[cfg(target_arch = "x86")]
- use crate::arch::x86::_mm_movemask_pi8;
- #[cfg(target_arch = "x86_64")]
- use crate::arch::x86_64::_mm_movemask_pi8;
-
- _mm_movemask_pi8(crate::mem::transmute(self)) != 0
- }
- }
- };
-}
diff --git a/third_party/rust/packed_simd/src/codegen/shuffle.rs b/third_party/rust/packed_simd/src/codegen/shuffle.rs
--- a/third_party/rust/packed_simd/src/codegen/shuffle.rs
+++ b/third_party/rust/packed_simd/src/codegen/shuffle.rs
@@ -1,302 +1,150 @@
//! Implementations of the `ShuffleResult` trait for the different numbers of
//! lanes and vector element types.
use crate::masks::*;
-use crate::sealed::Shuffle;
-
-impl Shuffle<[u32; 2]> for i8 {
- type Output = crate::codegen::i8x2;
-}
-impl Shuffle<[u32; 4]> for i8 {
- type Output = crate::codegen::i8x4;
-}
-impl Shuffle<[u32; 8]> for i8 {
- type Output = crate::codegen::i8x8;
-}
-impl Shuffle<[u32; 16]> for i8 {
- type Output = crate::codegen::i8x16;
-}
-impl Shuffle<[u32; 32]> for i8 {
- type Output = crate::codegen::i8x32;
-}
-impl Shuffle<[u32; 64]> for i8 {
- type Output = crate::codegen::i8x64;
-}
-
-impl Shuffle<[u32; 2]> for u8 {
- type Output = crate::codegen::u8x2;
-}
-impl Shuffle<[u32; 4]> for u8 {
- type Output = crate::codegen::u8x4;
-}
-impl Shuffle<[u32; 8]> for u8 {
- type Output = crate::codegen::u8x8;
-}
-impl Shuffle<[u32; 16]> for u8 {
- type Output = crate::codegen::u8x16;
-}
-impl Shuffle<[u32; 32]> for u8 {
- type Output = crate::codegen::u8x32;
-}
-impl Shuffle<[u32; 64]> for u8 {
- type Output = crate::codegen::u8x64;
-}
-
-impl Shuffle<[u32; 2]> for m8 {
- type Output = crate::codegen::m8x2;
-}
-impl Shuffle<[u32; 4]> for m8 {
- type Output = crate::codegen::m8x4;
-}
-impl Shuffle<[u32; 8]> for m8 {
- type Output = crate::codegen::m8x8;
-}
-impl Shuffle<[u32; 16]> for m8 {
- type Output = crate::codegen::m8x16;
-}
-impl Shuffle<[u32; 32]> for m8 {
- type Output = crate::codegen::m8x32;
-}
-impl Shuffle<[u32; 64]> for m8 {
- type Output = crate::codegen::m8x64;
-}
+use crate::sealed::{Shuffle, Seal};
-impl Shuffle<[u32; 2]> for i16 {
- type Output = crate::codegen::i16x2;
-}
-impl Shuffle<[u32; 4]> for i16 {
- type Output = crate::codegen::i16x4;
-}
-impl Shuffle<[u32; 8]> for i16 {
- type Output = crate::codegen::i16x8;
-}
-impl Shuffle<[u32; 16]> for i16 {
- type Output = crate::codegen::i16x16;
-}
-impl Shuffle<[u32; 32]> for i16 {
- type Output = crate::codegen::i16x32;
-}
-
-impl Shuffle<[u32; 2]> for u16 {
- type Output = crate::codegen::u16x2;
-}
-impl Shuffle<[u32; 4]> for u16 {
- type Output = crate::codegen::u16x4;
-}
-impl Shuffle<[u32; 8]> for u16 {
- type Output = crate::codegen::u16x8;
-}
-impl Shuffle<[u32; 16]> for u16 {
- type Output = crate::codegen::u16x16;
-}
-impl Shuffle<[u32; 32]> for u16 {
- type Output = crate::codegen::u16x32;
-}
-
-impl Shuffle<[u32; 2]> for m16 {
- type Output = crate::codegen::m16x2;
-}
-impl Shuffle<[u32; 4]> for m16 {
- type Output = crate::codegen::m16x4;
-}
-impl Shuffle<[u32; 8]> for m16 {
- type Output = crate::codegen::m16x8;
-}
-impl Shuffle<[u32; 16]> for m16 {
- type Output = crate::codegen::m16x16;
-}
-impl Shuffle<[u32; 32]> for m16 {
- type Output = crate::codegen::m16x32;
-}
-
-impl Shuffle<[u32; 2]> for i32 {
- type Output = crate::codegen::i32x2;
-}
-impl Shuffle<[u32; 4]> for i32 {
- type Output = crate::codegen::i32x4;
-}
-impl Shuffle<[u32; 8]> for i32 {
- type Output = crate::codegen::i32x8;
-}
-impl Shuffle<[u32; 16]> for i32 {
- type Output = crate::codegen::i32x16;
+macro_rules! impl_shuffle {
+ ($array:ty, $base:ty, $out:ty) => {
+ impl Seal<$array> for $base {}
+ impl Shuffle<$array> for $base {
+ type Output = $out;
+ }
+ }
}
-impl Shuffle<[u32; 2]> for u32 {
- type Output = crate::codegen::u32x2;
-}
-impl Shuffle<[u32; 4]> for u32 {
- type Output = crate::codegen::u32x4;
-}
-impl Shuffle<[u32; 8]> for u32 {
- type Output = crate::codegen::u32x8;
-}
-impl Shuffle<[u32; 16]> for u32 {
- type Output = crate::codegen::u32x16;
-}
+impl_shuffle! { [u32; 2], i8, crate::codegen::i8x2 }
+impl_shuffle! { [u32; 4], i8, crate::codegen::i8x4 }
+impl_shuffle! { [u32; 8], i8, crate::codegen::i8x8 }
+impl_shuffle! { [u32; 16], i8, crate::codegen::i8x16 }
+impl_shuffle! { [u32; 32], i8, crate::codegen::i8x32 }
+impl_shuffle! { [u32; 64], i8, crate::codegen::i8x64 }
-impl Shuffle<[u32; 2]> for f32 {
- type Output = crate::codegen::f32x2;
-}
-impl Shuffle<[u32; 4]> for f32 {
- type Output = crate::codegen::f32x4;
-}
-impl Shuffle<[u32; 8]> for f32 {
- type Output = crate::codegen::f32x8;
-}
-impl Shuffle<[u32; 16]> for f32 {
- type Output = crate::codegen::f32x16;
-}
+impl_shuffle! { [u32; 2], u8, crate::codegen::u8x2 }
+impl_shuffle! { [u32; 4], u8, crate::codegen::u8x4 }
+impl_shuffle! { [u32; 8], u8, crate::codegen::u8x8 }
+impl_shuffle! { [u32; 16], u8, crate::codegen::u8x16 }
+impl_shuffle! { [u32; 32], u8, crate::codegen::u8x32 }
+impl_shuffle! { [u32; 64], u8, crate::codegen::u8x64 }
+
+impl_shuffle! { [u32; 2], m8, crate::codegen::m8x2 }
+impl_shuffle! { [u32; 4], m8, crate::codegen::m8x4 }
+impl_shuffle! { [u32; 8], m8, crate::codegen::m8x8 }
+impl_shuffle! { [u32; 16], m8, crate::codegen::m8x16 }
+impl_shuffle! { [u32; 32], m8, crate::codegen::m8x32 }
+impl_shuffle! { [u32; 64], m8, crate::codegen::m8x64 }
+
+impl_shuffle! { [u32; 2], i16, crate::codegen::i16x2 }
+impl_shuffle! { [u32; 4], i16, crate::codegen::i16x4 }
+impl_shuffle! { [u32; 8], i16, crate::codegen::i16x8 }
+impl_shuffle! { [u32; 16], i16, crate::codegen::i16x16 }
+impl_shuffle! { [u32; 32], i16, crate::codegen::i16x32 }
-impl Shuffle<[u32; 2]> for m32 {
- type Output = crate::codegen::m32x2;
-}
-impl Shuffle<[u32; 4]> for m32 {
- type Output = crate::codegen::m32x4;
-}
-impl Shuffle<[u32; 8]> for m32 {
- type Output = crate::codegen::m32x8;
-}
-impl Shuffle<[u32; 16]> for m32 {
- type Output = crate::codegen::m32x16;
-}
+impl_shuffle! { [u32; 2], u16, crate::codegen::u16x2 }
+impl_shuffle! { [u32; 4], u16, crate::codegen::u16x4 }
+impl_shuffle! { [u32; 8], u16, crate::codegen::u16x8 }
+impl_shuffle! { [u32; 16], u16, crate::codegen::u16x16 }
+impl_shuffle! { [u32; 32], u16, crate::codegen::u16x32 }
+
+impl_shuffle! { [u32; 2], m16, crate::codegen::m16x2 }
+impl_shuffle! { [u32; 4], m16, crate::codegen::m16x4 }
+impl_shuffle! { [u32; 8], m16, crate::codegen::m16x8 }
+impl_shuffle! { [u32; 16], m16, crate::codegen::m16x16 }
-/* FIXME: 64-bit single element vector
-impl Shuffle<[u32; 1]> for i64 {
- type Output = crate::codegen::i64x1;
-}
-*/
-impl Shuffle<[u32; 2]> for i64 {
- type Output = crate::codegen::i64x2;
-}
-impl Shuffle<[u32; 4]> for i64 {
- type Output = crate::codegen::i64x4;
-}
-impl Shuffle<[u32; 8]> for i64 {
- type Output = crate::codegen::i64x8;
-}
+impl_shuffle! { [u32; 2], i32, crate::codegen::i32x2 }
+impl_shuffle! { [u32; 4], i32, crate::codegen::i32x4 }
+impl_shuffle! { [u32; 8], i32, crate::codegen::i32x8 }
+impl_shuffle! { [u32; 16], i32, crate::codegen::i32x16 }
+
+impl_shuffle! { [u32; 2], u32, crate::codegen::u32x2 }
+impl_shuffle! { [u32; 4], u32, crate::codegen::u32x4 }
+impl_shuffle! { [u32; 8], u32, crate::codegen::u32x8 }
+impl_shuffle! { [u32; 16], u32, crate::codegen::u32x16 }
+
+impl_shuffle! { [u32; 2], f32, crate::codegen::f32x2 }
+impl_shuffle! { [u32; 4], f32, crate::codegen::f32x4 }
+impl_shuffle! { [u32; 8], f32, crate::codegen::f32x8 }
+impl_shuffle! { [u32; 16], f32, crate::codegen::f32x16 }
+
+impl_shuffle! { [u32; 2], m32, crate::codegen::m32x2 }
+impl_shuffle! { [u32; 4], m32, crate::codegen::m32x4 }
+impl_shuffle! { [u32; 8], m32, crate::codegen::m32x8 }
+impl_shuffle! { [u32; 16], m32, crate::codegen::m32x16 }
/* FIXME: 64-bit single element vector
-impl Shuffle<[u32; 1]> for u64 {
- type Output = crate::codegen::u64x1;
-}
+impl_shuffle! { [u32; 1], i64, crate::codegen::i64x1 }
*/
-impl Shuffle<[u32; 2]> for u64 {
- type Output = crate::codegen::u64x2;
-}
-impl Shuffle<[u32; 4]> for u64 {
- type Output = crate::codegen::u64x4;
-}
-impl Shuffle<[u32; 8]> for u64 {
- type Output = crate::codegen::u64x8;
-}
+impl_shuffle! { [u32; 2], i64, crate::codegen::i64x2 }
+impl_shuffle! { [u32; 4], i64, crate::codegen::i64x4 }
+impl_shuffle! { [u32; 8], i64, crate::codegen::i64x8 }
/* FIXME: 64-bit single element vector
-impl Shuffle<[u32; 1]> for f64 {
- type Output = crate::codegen::f64x1;
-}
+impl_shuffle! { [u32; 1], i64, crate::codegen::i64x1 }
*/
-impl Shuffle<[u32; 2]> for f64 {
- type Output = crate::codegen::f64x2;
-}
-impl Shuffle<[u32; 4]> for f64 {
- type Output = crate::codegen::f64x4;
-}
-impl Shuffle<[u32; 8]> for f64 {
- type Output = crate::codegen::f64x8;
-}
+impl_shuffle! { [u32; 2], u64, crate::codegen::u64x2 }
+impl_shuffle! { [u32; 4], u64, crate::codegen::u64x4 }
+impl_shuffle! { [u32; 8], u64, crate::codegen::u64x8 }
/* FIXME: 64-bit single element vector
-impl Shuffle<[u32; 1]> for m64 {
- type Output = crate::codegen::m64x1;
-}
+impl_shuffle! { [u32; 1], i64, crate::codegen::i64x1 }
*/
-impl Shuffle<[u32; 2]> for m64 {
- type Output = crate::codegen::m64x2;
-}
-impl Shuffle<[u32; 4]> for m64 {
- type Output = crate::codegen::m64x4;
-}
-impl Shuffle<[u32; 8]> for m64 {
- type Output = crate::codegen::m64x8;
-}
+impl_shuffle! { [u32; 2], f64, crate::codegen::f64x2 }
+impl_shuffle! { [u32; 4], f64, crate::codegen::f64x4 }
+impl_shuffle! { [u32; 8], f64, crate::codegen::f64x8 }
+
+/* FIXME: 64-bit single element vector
+impl_shuffle! { [u32; 1], i64, crate::codegen::i64x1 }
+*/
+impl_shuffle! { [u32; 2], m64, crate::codegen::m64x2 }
+impl_shuffle! { [u32; 4], m64, crate::codegen::m64x4 }
+impl_shuffle! { [u32; 8], m64, crate::codegen::m64x8 }
-impl Shuffle<[u32; 2]> for isize {
- type Output = crate::codegen::isizex2;
-}
-impl Shuffle<[u32; 4]> for isize {
- type Output = crate::codegen::isizex4;
-}
-impl Shuffle<[u32; 8]> for isize {
- type Output = crate::codegen::isizex8;
-}
+impl_shuffle! { [u32; 2], isize, crate::codegen::isizex2 }
+impl_shuffle! { [u32; 4], isize, crate::codegen::isizex4 }
+impl_shuffle! { [u32; 8], isize, crate::codegen::isizex8 }
-impl Shuffle<[u32; 2]> for usize {
- type Output = crate::codegen::usizex2;
-}
-impl Shuffle<[u32; 4]> for usize {
- type Output = crate::codegen::usizex4;
-}
-impl Shuffle<[u32; 8]> for usize {
- type Output = crate::codegen::usizex8;
-}
+impl_shuffle! { [u32; 2], usize, crate::codegen::usizex2 }
+impl_shuffle! { [u32; 4], usize, crate::codegen::usizex4 }
+impl_shuffle! { [u32; 8], usize, crate::codegen::usizex8 }
+impl_shuffle! { [u32; 2], msize, crate::codegen::msizex2 }
+impl_shuffle! { [u32; 4], msize, crate::codegen::msizex4 }
+impl_shuffle! { [u32; 8], msize, crate::codegen::msizex8 }
+
+impl<T> Seal<[u32; 2]> for *const T {}
impl<T> Shuffle<[u32; 2]> for *const T {
type Output = crate::codegen::cptrx2<T>;
}
+impl<T> Seal<[u32; 4]> for *const T {}
impl<T> Shuffle<[u32; 4]> for *const T {
type Output = crate::codegen::cptrx4<T>;
}
+impl<T> Seal<[u32; 8]> for *const T {}
impl<T> Shuffle<[u32; 8]> for *const T {
type Output = crate::codegen::cptrx8<T>;
}
+impl<T> Seal<[u32; 2]> for *mut T {}
impl<T> Shuffle<[u32; 2]> for *mut T {
type Output = crate::codegen::mptrx2<T>;
}
+impl<T> Seal<[u32; 4]> for *mut T {}
impl<T> Shuffle<[u32; 4]> for *mut T {
type Output = crate::codegen::mptrx4<T>;
}
+impl<T> Seal<[u32; 8]> for *mut T {}
impl<T> Shuffle<[u32; 8]> for *mut T {
type Output = crate::codegen::mptrx8<T>;
}
-impl Shuffle<[u32; 2]> for msize {
- type Output = crate::codegen::msizex2;
-}
-impl Shuffle<[u32; 4]> for msize {
- type Output = crate::codegen::msizex4;
-}
-impl Shuffle<[u32; 8]> for msize {
- type Output = crate::codegen::msizex8;
-}
-
-impl Shuffle<[u32; 1]> for i128 {
- type Output = crate::codegen::i128x1;
-}
-impl Shuffle<[u32; 2]> for i128 {
- type Output = crate::codegen::i128x2;
-}
-impl Shuffle<[u32; 4]> for i128 {
- type Output = crate::codegen::i128x4;
-}
+impl_shuffle! { [u32; 1], i128, crate::codegen::i128x1 }
+impl_shuffle! { [u32; 2], i128, crate::codegen::i128x2 }
+impl_shuffle! { [u32; 4], i128, crate::codegen::i128x4 }
-impl Shuffle<[u32; 1]> for u128 {
- type Output = crate::codegen::u128x1;
-}
-impl Shuffle<[u32; 2]> for u128 {
- type Output = crate::codegen::u128x2;
-}
-impl Shuffle<[u32; 4]> for u128 {
- type Output = crate::codegen::u128x4;
-}
+impl_shuffle! { [u32; 1], u128, crate::codegen::u128x1 }
+impl_shuffle! { [u32; 2], u128, crate::codegen::u128x2 }
+impl_shuffle! { [u32; 4], u128, crate::codegen::u128x4 }
-impl Shuffle<[u32; 1]> for m128 {
- type Output = crate::codegen::m128x1;
-}
-impl Shuffle<[u32; 2]> for m128 {
- type Output = crate::codegen::m128x2;
-}
-impl Shuffle<[u32; 4]> for m128 {
- type Output = crate::codegen::m128x4;
-}
+impl_shuffle! { [u32; 1], m128, crate::codegen::m128x1 }
+impl_shuffle! { [u32; 2], m128, crate::codegen::m128x2 }
+impl_shuffle! { [u32; 4], m128, crate::codegen::m128x4 }
diff --git a/third_party/rust/packed_simd/src/codegen/shuffle1_dyn.rs b/third_party/rust/packed_simd/src/codegen/shuffle1_dyn.rs
--- a/third_party/rust/packed_simd/src/codegen/shuffle1_dyn.rs
+++ b/third_party/rust/packed_simd/src/codegen/shuffle1_dyn.rs
@@ -23,53 +23,32 @@ macro_rules! impl_fallback {
}
}
};
}
macro_rules! impl_shuffle1_dyn {
(u8x8) => {
cfg_if! {
- if #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"),
- target_feature = "ssse3"))] {
- impl Shuffle1Dyn for u8x8 {
- type Indices = Self;
- #[inline]
- fn shuffle1_dyn(self, indices: Self::Indices) -> Self {
- #[cfg(target_arch = "x86")]
- use crate::arch::x86::_mm_shuffle_pi8;
- #[cfg(target_arch = "x86_64")]
- use crate::arch::x86_64::_mm_shuffle_pi8;
-
- unsafe {
- crate::mem::transmute(
- _mm_shuffle_pi8(
- crate::mem::transmute(self.0),
- crate::mem::transmute(indices.0)
- )
- )
- }
- }
- }
- } else if #[cfg(all(
+ if #[cfg(all(
any(
- all(target_aarch = "aarch64", target_feature = "neon"),
- all(target_aarch = "arm", target_feature = "v7",
+ all(target_arch = "aarch64", target_feature = "neon"),
+ all(target_arch = "doesnotexist", target_feature = "v7",
target_feature = "neon")
),
any(feature = "core_arch", libcore_neon)
)
)] {
impl Shuffle1Dyn for u8x8 {
type Indices = Self;
#[inline]
fn shuffle1_dyn(self, indices: Self::Indices) -> Self {
- #[cfg(targt_arch = "aarch64")]
+ #[cfg(target_arch = "aarch64")]
use crate::arch::aarch64::vtbl1_u8;
- #[cfg(targt_arch = "arm")]
+ #[cfg(target_arch = "doesnotexist")]
use crate::arch::arm::vtbl1_u8;
// This is safe because the binary is compiled with
// neon enabled at compile-time and can therefore only
// run on CPUs that have it enabled.
unsafe {
Simd(mem::transmute(
vtbl1_u8(mem::transmute(self.0),
@@ -101,17 +80,17 @@ macro_rules! impl_shuffle1_dyn {
unsafe {
Simd(mem::transmute(
_mm_shuffle_epi8(mem::transmute(self.0),
crate::mem::transmute(indices))
))
}
}
}
- } else if #[cfg(all(target_aarch = "aarch64", target_feature = "neon",
+ } else if #[cfg(all(target_arch = "aarch64", target_feature = "neon",
any(feature = "core_arch", libcore_neon)))] {
impl Shuffle1Dyn for u8x16 {
type Indices = Self;
#[inline]
fn shuffle1_dyn(self, indices: Self::Indices) -> Self {
use crate::arch::aarch64::vqtbl1q_u8;
// This is safe because the binary is compiled with
@@ -120,17 +99,17 @@ macro_rules! impl_shuffle1_dyn {
unsafe {
Simd(mem::transmute(
vqtbl1q_u8(mem::transmute(self.0),
crate::mem::transmute(indices.0))
))
}
}
}
- } else if #[cfg(all(target_aarch = "arm", target_feature = "v7",
+ } else if #[cfg(all(target_arch = "doesnotexist", target_feature = "v7",
target_feature = "neon",
any(feature = "core_arch", libcore_neon)))] {
impl Shuffle1Dyn for u8x16 {
type Indices = Self;
#[inline]
fn shuffle1_dyn(self, indices: Self::Indices) -> Self {
use crate::arch::arm::vtbl2_u8;
diff --git a/third_party/rust/packed_simd/src/codegen/vPtr.rs b/third_party/rust/packed_simd/src/codegen/vPtr.rs
--- a/third_party/rust/packed_simd/src/codegen/vPtr.rs
+++ b/third_party/rust/packed_simd/src/codegen/vPtr.rs
@@ -3,23 +3,25 @@
macro_rules! impl_simd_ptr {
([$ptr_ty:ty; $elem_count:expr]: $tuple_id:ident | $ty:ident
| $($tys:ty),*) => {
#[derive(Copy, Clone)]
#[repr(simd)]
pub struct $tuple_id<$ty>($(crate $tys),*);
//^^^^^^^ leaked through SimdArray
+ impl<$ty> crate::sealed::Seal for [$ptr_ty; $elem_count] {}
impl<$ty> crate::sealed::SimdArray for [$ptr_ty; $elem_count] {
type Tuple = $tuple_id<$ptr_ty>;
type T = $ptr_ty;
const N: usize = $elem_count;
type NT = [u32; $elem_count];
}
+ impl<$ty> crate::sealed::Seal for $tuple_id<$ptr_ty> {}
impl<$ty> crate::sealed::Simd for $tuple_id<$ptr_ty> {
type Element = $ptr_ty;
const LANES: usize = $elem_count;
type LanesType = [u32; $elem_count];
}
}
}
diff --git a/third_party/rust/packed_simd/src/lib.rs b/third_party/rust/packed_simd/src/lib.rs
--- a/third_party/rust/packed_simd/src/lib.rs
+++ b/third_party/rust/packed_simd/src/lib.rs
@@ -196,40 +196,45 @@
//!
//! * casting from an `f64` to an `f32` **rounds to nearest, ties to even**.
//!
//! Numeric casts are not very "precise": sometimes lossy, sometimes value
//! preserving, etc.
#![feature(
repr_simd,
+ rustc_attrs,
const_fn,
platform_intrinsics,
stdsimd,
aarch64_target_feature,
arm_target_feature,
link_llvm_intrinsics,
core_intrinsics,
stmt_expr_attributes,
- align_offset,
- mmx_target_feature,
crate_visibility_modifier,
custom_inner_attributes
)]
#![allow(non_camel_case_types, non_snake_case,
- clippy::cast_possible_truncation,
- clippy::cast_lossless,
- clippy::cast_possible_wrap,
- clippy::cast_precision_loss,
- // This lint is currently broken for generic code
- // See https://github.com/rust-lang/rust-clippy/issues/3410
- clippy::use_self
+ // FIXME: these types are unsound in C FFI already
+ // See https://github.com/rust-lang/rust/issues/53346
+ improper_ctypes_definitions,
+ clippy::cast_possible_truncation,
+ clippy::cast_lossless,
+ clippy::cast_possible_wrap,
+ clippy::cast_precision_loss,
+ // TODO: manually add the `#[must_use]` attribute where appropriate
+ clippy::must_use_candidate,
+ // This lint is currently broken for generic code
+ // See https://github.com/rust-lang/rust-clippy/issues/3410
+ clippy::use_self,
+ clippy::wrong_self_convention,
)]
#![cfg_attr(test, feature(hashmap_internals))]
-#![deny(warnings, rust_2018_idioms, clippy::missing_inline_in_public_items)]
+#![deny(rust_2018_idioms, clippy::missing_inline_in_public_items)]
#![no_std]
use cfg_if::cfg_if;
cfg_if! {
if #[cfg(feature = "core_arch")] {
#[allow(unused_imports)]
use core_arch as arch;
@@ -251,16 +256,18 @@ use core::{
#[macro_use]
mod testing;
#[macro_use]
mod api;
mod codegen;
mod sealed;
+pub use crate::sealed::{Simd as SimdVector, Shuffle, SimdArray, Mask};
+
/// Packed SIMD vector type.
///
/// # Examples
///
/// ```
/// # use packed_simd::Simd;
/// let v = Simd::<[i32; 4]>::new(0, 1, 2, 3);
/// assert_eq!(v.extract(2), 2);
@@ -271,16 +278,18 @@ pub struct Simd<A: sealed::SimdArray>(
// FIXME: this type should be private,
// but it currently must be public for the
// `shuffle!` macro to work: it needs to
// access the internal `repr(simd)` type
// to call the shuffle intrinsics.
#[doc(hidden)] pub <A as sealed::SimdArray>::Tuple,
);
+impl<A: sealed::SimdArray> sealed::Seal for Simd<A> {}
+
/// Wrapper over `T` implementing a lexicoraphical order via the `PartialOrd`
/// and/or `Ord` traits.
#[repr(transparent)]
#[derive(Copy, Clone, Debug)]
#[allow(clippy::missing_inline_in_public_items)]
pub struct LexicographicallyOrdered<T>(T);
mod masks;
diff --git a/third_party/rust/packed_simd/src/masks.rs b/third_party/rust/packed_simd/src/masks.rs
--- a/third_party/rust/packed_simd/src/masks.rs
+++ b/third_party/rust/packed_simd/src/masks.rs
@@ -1,17 +1,19 @@
//! Mask types
macro_rules! impl_mask_ty {
($id:ident : $elem_ty:ident | #[$doc:meta]) => {
#[$doc]
#[derive(Copy, Clone)]
pub struct $id($elem_ty);
+ impl crate::sealed::Seal for $id {}
impl crate::sealed::Mask for $id {
+ #[inline]
fn test(&self) -> bool {
$id::test(self)
}
}
impl $id {
/// Instantiate a mask with `value`
#[inline]
diff --git a/third_party/rust/packed_simd/src/sealed.rs b/third_party/rust/packed_simd/src/sealed.rs
--- a/third_party/rust/packed_simd/src/sealed.rs
+++ b/third_party/rust/packed_simd/src/sealed.rs
@@ -1,41 +1,42 @@
//! Sealed traits
+/// A sealed trait, this is logically private to the crate
+/// and will prevent implementations from outside the crate
+pub trait Seal<T = ()> {}
+
/// Trait implemented by arrays that can be SIMD types.
-#[doc(hidden)]
-pub trait SimdArray {
+pub trait SimdArray: Seal {
/// The type of the #[repr(simd)] type.
type Tuple: Copy + Clone;
/// The element type of the vector.
type T;
/// The number of elements in the array.
const N: usize;
/// The type: `[u32; Self::N]`.
type NT;
}
/// This traits is used to constraint the arguments
/// and result type of the portable shuffles.
#[doc(hidden)]
-pub trait Shuffle<Lanes> {
+pub trait Shuffle<Lanes>: Seal<Lanes> {
// Lanes is a `[u32; N]` where `N` is the number of vector lanes
/// The result type of the shuffle.
type Output;
}
/// This trait is implemented by all SIMD vector types.
-#[doc(hidden)]
-pub trait Simd {
+pub trait Simd: Seal {
/// Element type of the SIMD vector
type Element;
/// The number of elements in the SIMD vector.
const LANES: usize;
/// The type: `[u32; Self::N]`.
type LanesType;
}
/// This trait is implemented by all mask types
-#[doc(hidden)]
-pub trait Mask {
+pub trait Mask: Seal {
fn test(&self) -> bool;
}
diff --git a/third_party/rust/packed_simd/src/testing/utils.rs b/third_party/rust/packed_simd/src/testing/utils.rs
--- a/third_party/rust/packed_simd/src/testing/utils.rs
+++ b/third_party/rust/packed_simd/src/testing/utils.rs
@@ -1,11 +1,13 @@
//! Testing utilities
#![allow(dead_code)]
+// FIXME: Or don't. But it's true this is a problematic comparison.
+#![allow(clippy::neg_cmp_op_on_partial_ord)]
use crate::{cmp::PartialOrd, fmt::Debug, LexicographicallyOrdered};
/// Tests PartialOrd for `a` and `b` where `a < b` is true.
pub fn test_lt<T>(
a: LexicographicallyOrdered<T>, b: LexicographicallyOrdered<T>,
) where
LexicographicallyOrdered<T>: Debug + PartialOrd,
@@ -14,37 +16,42 @@ pub fn test_lt<T>(
assert!(b > a, "{:?}, {:?}", a, b);
assert!(!(a == b), "{:?}, {:?}", a, b);
assert!(a != b, "{:?}, {:?}", a, b);
assert!(a <= b, "{:?}, {:?}", a, b);
assert!(b >= a, "{:?}, {:?}", a, b);
- // Irreflexivity
- assert!(!(a < a), "{:?}, {:?}", a, b);
- assert!(!(b < b), "{:?}, {:?}", a, b);
- assert!(!(a > a), "{:?}, {:?}", a, b);
- assert!(!(b > b), "{:?}, {:?}", a, b);
+ // The elegance of the mathematical expression of irreflexivity is more
+ // than clippy can handle.
+ #[allow(clippy::eq_op)]
+ {
+ // Irreflexivity
+ assert!(!(a < a), "{:?}, {:?}", a, b);
+ assert!(!(b < b), "{:?}, {:?}", a, b);
+ assert!(!(a > a), "{:?}, {:?}", a, b);
+ assert!(!(b > b), "{:?}, {:?}", a, b);
- assert!(a <= a, "{:?}, {:?}", a, b);
- assert!(b <= b, "{:?}, {:?}", a, b);
+ assert!(a <= a, "{:?}, {:?}", a, b);
+ assert!(b <= b, "{:?}, {:?}", a, b);
+ }
}
/// Tests PartialOrd for `a` and `b` where `a <= b` is true.
pub fn test_le<T>(
a: LexicographicallyOrdered<T>, b: LexicographicallyOrdered<T>,
) where
LexicographicallyOrdered<T>: Debug + PartialOrd,
{
assert!(a <= b, "{:?}, {:?}", a, b);
assert!(b >= a, "{:?}, {:?}", a, b);
- assert!(a == b || a < b, "{:?}, {:?}", a, b);
- assert!(a == b || b > a, "{:?}, {:?}", a, b);
+ assert!(a <= b, "{:?}, {:?}", a, b);
+ assert!(b >= a, "{:?}, {:?}", a, b);
if a == b {
assert!(!(a < b), "{:?}, {:?}", a, b);
assert!(!(b > a), "{:?}, {:?}", a, b);
assert!(!(a != b), "{:?}, {:?}", a, b);
} else {
assert!(a != b, "{:?}, {:?}", a, b);
diff --git a/third_party/rust/packed_simd/src/v128.rs b/third_party/rust/packed_simd/src/v128.rs
--- a/third_party/rust/packed_simd/src/v128.rs
+++ b/third_party/rust/packed_simd/src/v128.rs
@@ -1,80 +1,80 @@
//! 128-bit wide vector types
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
-impl_i!([i8; 16]: i8x16, m8x16 | i8 | test_v128 |
+impl_i!([i8; 16]: i8x16, m8x16 | i8, u16 | test_v128 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: |
/// A 128-bit vector with 16 `i8` lanes.
);
-impl_u!([u8; 16]: u8x16, m8x16 | u8 | test_v128 |
+impl_u!([u8; 16]: u8x16, m8x16 | u8, u16 | test_v128 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: |
/// A 128-bit vector with 16 `u8` lanes.
);
-impl_m!([m8; 16]: m8x16 | i8 | test_v128 |
+impl_m!([m8; 16]: m8x16 | i8, u16 | test_v128 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: m16x16 |
/// A 128-bit vector mask with 16 `m8` lanes.
);
-impl_i!([i16; 8]: i16x8, m16x8 | i16 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_i!([i16; 8]: i16x8, m16x8 | i16, u8 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: i8x8, u8x8 |
/// A 128-bit vector with 8 `i16` lanes.
);
-impl_u!([u16; 8]: u16x8, m16x8 | u16| test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_u!([u16; 8]: u16x8, m16x8 | u16, u8 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: u8x8 |
/// A 128-bit vector with 8 `u16` lanes.
);
-impl_m!([m16; 8]: m16x8 | i16 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_m!([m16; 8]: m16x8 | i16, u8 | test_v128 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: m8x8, m32x8 |
/// A 128-bit vector mask with 8 `m16` lanes.
);
-impl_i!([i32; 4]: i32x4, m32x4 | i32 | test_v128 | x0, x1, x2, x3 |
+impl_i!([i32; 4]: i32x4, m32x4 | i32, u8 | test_v128 | x0, x1, x2, x3 |
From: i8x4, u8x4, i16x4, u16x4 |
/// A 128-bit vector with 4 `i32` lanes.
);
-impl_u!([u32; 4]: u32x4, m32x4 | u32| test_v128 | x0, x1, x2, x3 |
+impl_u!([u32; 4]: u32x4, m32x4 | u32, u8 | test_v128 | x0, x1, x2, x3 |
From: u8x4, u16x4 |
/// A 128-bit vector with 4 `u32` lanes.
);
impl_f!([f32; 4]: f32x4, m32x4 | f32 | test_v128 | x0, x1, x2, x3 |
From: i8x4, u8x4, i16x4, u16x4 |
/// A 128-bit vector with 4 `f32` lanes.
);
-impl_m!([m32; 4]: m32x4 | i32 | test_v128 | x0, x1, x2, x3 |
+impl_m!([m32; 4]: m32x4 | i32, u8 | test_v128 | x0, x1, x2, x3 |
From: m8x4, m16x4, m64x4 |
/// A 128-bit vector mask with 4 `m32` lanes.
);
-impl_i!([i64; 2]: i64x2, m64x2 | i64 | test_v128 | x0, x1 |
+impl_i!([i64; 2]: i64x2, m64x2 | i64, u8 | test_v128 | x0, x1 |
From: i8x2, u8x2, i16x2, u16x2, i32x2, u32x2 |
/// A 128-bit vector with 2 `i64` lanes.
);
-impl_u!([u64; 2]: u64x2, m64x2 | u64 | test_v128 | x0, x1 |
+impl_u!([u64; 2]: u64x2, m64x2 | u64, u8 | test_v128 | x0, x1 |
From: u8x2, u16x2, u32x2 |
/// A 128-bit vector with 2 `u64` lanes.
);
impl_f!([f64; 2]: f64x2, m64x2 | f64 | test_v128 | x0, x1 |
From: i8x2, u8x2, i16x2, u16x2, i32x2, u32x2, f32x2 |
/// A 128-bit vector with 2 `f64` lanes.
);
-impl_m!([m64; 2]: m64x2 | i64 | test_v128 | x0, x1 |
+impl_m!([m64; 2]: m64x2 | i64, u8 | test_v128 | x0, x1 |
From: m8x2, m16x2, m32x2, m128x2 |
/// A 128-bit vector mask with 2 `m64` lanes.
);
-impl_i!([i128; 1]: i128x1, m128x1 | i128 | test_v128 | x0 |
+impl_i!([i128; 1]: i128x1, m128x1 | i128, u8 | test_v128 | x0 |
From: /*i8x1, u8x1, i16x1, u16x1, i32x1, u32x1, i64x1, u64x1 */ | // FIXME: unary small vector types
/// A 128-bit vector with 1 `i128` lane.
);
-impl_u!([u128; 1]: u128x1, m128x1 | u128 | test_v128 | x0 |
+impl_u!([u128; 1]: u128x1, m128x1 | u128, u8 | test_v128 | x0 |
From: /*u8x1, u16x1, u32x1, u64x1 */ | // FIXME: unary small vector types
/// A 128-bit vector with 1 `u128` lane.
);
-impl_m!([m128; 1]: m128x1 | i128 | test_v128 | x0 |
+impl_m!([m128; 1]: m128x1 | i128, u8 | test_v128 | x0 |
From: /*m8x1, m16x1, m32x1, m64x1 */ | // FIXME: unary small vector types
/// A 128-bit vector mask with 1 `m128` lane.
);
diff --git a/third_party/rust/packed_simd/src/v16.rs b/third_party/rust/packed_simd/src/v16.rs
--- a/third_party/rust/packed_simd/src/v16.rs
+++ b/third_party/rust/packed_simd/src/v16.rs
@@ -1,16 +1,16 @@
//! 16-bit wide vector types
use crate::*;
-impl_i!([i8; 2]: i8x2, m8x2 | i8 | test_v16 | x0, x1 |
+impl_i!([i8; 2]: i8x2, m8x2 | i8, u8 | test_v16 | x0, x1 |
From: |
/// A 16-bit vector with 2 `i8` lanes.
);
-impl_u!([u8; 2]: u8x2, m8x2 | u8 | test_v16 | x0, x1 |
+impl_u!([u8; 2]: u8x2, m8x2 | u8, u8 | test_v16 | x0, x1 |
From: |
/// A 16-bit vector with 2 `u8` lanes.
);
-impl_m!([m8; 2]: m8x2 | i8 | test_v16 | x0, x1 |
+impl_m!([m8; 2]: m8x2 | i8, u8 | test_v16 | x0, x1 |
From: m16x2, m32x2, m64x2, m128x2 |
/// A 16-bit vector mask with 2 `m8` lanes.
);
diff --git a/third_party/rust/packed_simd/src/v256.rs b/third_party/rust/packed_simd/src/v256.rs
--- a/third_party/rust/packed_simd/src/v256.rs
+++ b/third_party/rust/packed_simd/src/v256.rs
@@ -1,86 +1,86 @@
//! 256-bit wide vector types
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
-impl_i!([i8; 32]: i8x32, m8x32 | i8 | test_v256 |
+impl_i!([i8; 32]: i8x32, m8x32 | i8, u32 | test_v256 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
From: |
/// A 256-bit vector with 32 `i8` lanes.
);
-impl_u!([u8; 32]: u8x32, m8x32 | u8 | test_v256 |
+impl_u!([u8; 32]: u8x32, m8x32 | u8, u32 | test_v256 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
From: |
/// A 256-bit vector with 32 `u8` lanes.
);
-impl_m!([m8; 32]: m8x32 | i8 | test_v256 |
+impl_m!([m8; 32]: m8x32 | i8, u32 | test_v256 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
From: |
/// A 256-bit vector mask with 32 `m8` lanes.
);
-impl_i!([i16; 16]: i16x16, m16x16 | i16 | test_v256 |
+impl_i!([i16; 16]: i16x16, m16x16 | i16, u16 | test_v256 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: i8x16, u8x16 |
/// A 256-bit vector with 16 `i16` lanes.
);
-impl_u!([u16; 16]: u16x16, m16x16 | u16 | test_v256 |
+impl_u!([u16; 16]: u16x16, m16x16 | u16, u16 | test_v256 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: u8x16 |
/// A 256-bit vector with 16 `u16` lanes.
);
-impl_m!([m16; 16]: m16x16 | i16 | test_v256 |
+impl_m!([m16; 16]: m16x16 | i16, u16 | test_v256 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: m8x16 |
/// A 256-bit vector mask with 16 `m16` lanes.
);
-impl_i!([i32; 8]: i32x8, m32x8 | i32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_i!([i32; 8]: i32x8, m32x8 | i32, u8 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: i8x8, u8x8, i16x8, u16x8 |
/// A 256-bit vector with 8 `i32` lanes.
);
-impl_u!([u32; 8]: u32x8, m32x8 | u32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_u!([u32; 8]: u32x8, m32x8 | u32, u8 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: u8x8, u16x8 |
/// A 256-bit vector with 8 `u32` lanes.
);
impl_f!([f32; 8]: f32x8, m32x8 | f32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: i8x8, u8x8, i16x8, u16x8 |
/// A 256-bit vector with 8 `f32` lanes.
);
-impl_m!([m32; 8]: m32x8 | i32 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_m!([m32; 8]: m32x8 | i32, u8 | test_v256 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: m8x8, m16x8 |
/// A 256-bit vector mask with 8 `m32` lanes.
);
-impl_i!([i64; 4]: i64x4, m64x4 | i64 | test_v256 | x0, x1, x2, x3 |
+impl_i!([i64; 4]: i64x4, m64x4 | i64, u8 | test_v256 | x0, x1, x2, x3 |
From: i8x4, u8x4, i16x4, u16x4, i32x4, u32x4 |
/// A 256-bit vector with 4 `i64` lanes.
);
-impl_u!([u64; 4]: u64x4, m64x4 | u64 | test_v256 | x0, x1, x2, x3 |
+impl_u!([u64; 4]: u64x4, m64x4 | u64, u8 | test_v256 | x0, x1, x2, x3 |
From: u8x4, u16x4, u32x4 |
/// A 256-bit vector with 4 `u64` lanes.
);
impl_f!([f64; 4]: f64x4, m64x4 | f64 | test_v256 | x0, x1, x2, x3 |
From: i8x4, u8x4, i16x4, u16x4, i32x4, u32x4, f32x4 |
/// A 256-bit vector with 4 `f64` lanes.
);
-impl_m!([m64; 4]: m64x4 | i64 | test_v256 | x0, x1, x2, x3 |
+impl_m!([m64; 4]: m64x4 | i64, u8 | test_v256 | x0, x1, x2, x3 |
From: m8x4, m16x4, m32x4 |
/// A 256-bit vector mask with 4 `m64` lanes.
);
-impl_i!([i128; 2]: i128x2, m128x2 | i128 | test_v256 | x0, x1 |
+impl_i!([i128; 2]: i128x2, m128x2 | i128, u8 | test_v256 | x0, x1 |
From: i8x2, u8x2, i16x2, u16x2, i32x2, u32x2, i64x2, u64x2 |
/// A 256-bit vector with 2 `i128` lanes.
);
-impl_u!([u128; 2]: u128x2, m128x2 | u128 | test_v256 | x0, x1 |
+impl_u!([u128; 2]: u128x2, m128x2 | u128, u8 | test_v256 | x0, x1 |
From: u8x2, u16x2, u32x2, u64x2 |
/// A 256-bit vector with 2 `u128` lanes.
);
-impl_m!([m128; 2]: m128x2 | i128 | test_v256 | x0, x1 |
+impl_m!([m128; 2]: m128x2 | i128, u8 | test_v256 | x0, x1 |
From: m8x2, m16x2, m32x2, m64x2 |
/// A 256-bit vector mask with 2 `m128` lanes.
);
diff --git a/third_party/rust/packed_simd/src/v32.rs b/third_party/rust/packed_simd/src/v32.rs
--- a/third_party/rust/packed_simd/src/v32.rs
+++ b/third_party/rust/packed_simd/src/v32.rs
@@ -1,29 +1,29 @@
//! 32-bit wide vector types
use crate::*;
-impl_i!([i8; 4]: i8x4, m8x4 | i8 | test_v32 | x0, x1, x2, x3 |
+impl_i!([i8; 4]: i8x4, m8x4 | i8, u8 | test_v32 | x0, x1, x2, x3 |
From: |
/// A 32-bit vector with 4 `i8` lanes.
);
-impl_u!([u8; 4]: u8x4, m8x4 | u8 | test_v32 | x0, x1, x2, x3 |
+impl_u!([u8; 4]: u8x4, m8x4 | u8, u8 | test_v32 | x0, x1, x2, x3 |
From: |
/// A 32-bit vector with 4 `u8` lanes.
);
-impl_m!([m8; 4]: m8x4 | i8 | test_v32 | x0, x1, x2, x3 |
+impl_m!([m8; 4]: m8x4 | i8, u8 | test_v32 | x0, x1, x2, x3 |
From: m16x4, m32x4, m64x4 |
/// A 32-bit vector mask with 4 `m8` lanes.
);
-impl_i!([i16; 2]: i16x2, m16x2 | i16 | test_v32 | x0, x1 |
+impl_i!([i16; 2]: i16x2, m16x2 | i16, u8 | test_v32 | x0, x1 |
From: i8x2, u8x2 |
/// A 32-bit vector with 2 `i16` lanes.
);
-impl_u!([u16; 2]: u16x2, m16x2 | u16 | test_v32 | x0, x1 |
+impl_u!([u16; 2]: u16x2, m16x2 | u16, u8 | test_v32 | x0, x1 |
From: u8x2 |
/// A 32-bit vector with 2 `u16` lanes.
);
-impl_m!([m16; 2]: m16x2 | i16 | test_v32 | x0, x1 |
+impl_m!([m16; 2]: m16x2 | i16, u8 | test_v32 | x0, x1 |
From: m8x2, m32x2, m64x2, m128x2 |
/// A 32-bit vector mask with 2 `m16` lanes.
);
diff --git a/third_party/rust/packed_simd/src/v512.rs b/third_party/rust/packed_simd/src/v512.rs
--- a/third_party/rust/packed_simd/src/v512.rs
+++ b/third_party/rust/packed_simd/src/v512.rs
@@ -1,99 +1,99 @@
//! 512-bit wide vector types
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
-impl_i!([i8; 64]: i8x64, m8x64 | i8 | test_v512 |
+impl_i!([i8; 64]: i8x64, m8x64 | i8, u64 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31,
x32, x33, x34, x35, x36, x37, x38, x39, x40, x41, x42, x43, x44, x45, x46, x47,
x48, x49, x50, x51, x52, x53, x54, x55, x56, x57, x58, x59, x60, x61, x62, x63 |
From: |
/// A 512-bit vector with 64 `i8` lanes.
);
-impl_u!([u8; 64]: u8x64, m8x64 | u8 | test_v512 |
+impl_u!([u8; 64]: u8x64, m8x64 | u8, u64 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31,
x32, x33, x34, x35, x36, x37, x38, x39, x40, x41, x42, x43, x44, x45, x46, x47,
x48, x49, x50, x51, x52, x53, x54, x55, x56, x57, x58, x59, x60, x61, x62, x63 |
From: |
/// A 512-bit vector with 64 `u8` lanes.
);
-impl_m!([m8; 64]: m8x64 | i8 | test_v512 |
+impl_m!([m8; 64]: m8x64 | i8, u64 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31,
x32, x33, x34, x35, x36, x37, x38, x39, x40, x41, x42, x43, x44, x45, x46, x47,
x48, x49, x50, x51, x52, x53, x54, x55, x56, x57, x58, x59, x60, x61, x62, x63 |
From: |
/// A 512-bit vector mask with 64 `m8` lanes.
);
-impl_i!([i16; 32]: i16x32, m16x32 | i16 | test_v512 |
+impl_i!([i16; 32]: i16x32, m16x32 | i16, u32 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
From: i8x32, u8x32 |
/// A 512-bit vector with 32 `i16` lanes.
);
-impl_u!([u16; 32]: u16x32, m16x32 | u16 | test_v512 |
+impl_u!([u16; 32]: u16x32, m16x32 | u16, u32 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
From: u8x32 |
/// A 512-bit vector with 32 `u16` lanes.
);
-impl_m!([m16; 32]: m16x32 | i16 | test_v512 |
+impl_m!([m16; 32]: m16x32 | i16, u32 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15,
x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x30, x31 |
From: m8x32 |
/// A 512-bit vector mask with 32 `m16` lanes.
);
-impl_i!([i32; 16]: i32x16, m32x16 | i32 | test_v512 |
+impl_i!([i32; 16]: i32x16, m32x16 | i32, u16 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: i8x16, u8x16, i16x16, u16x16 |
/// A 512-bit vector with 16 `i32` lanes.
);
-impl_u!([u32; 16]: u32x16, m32x16 | u32 | test_v512 |
+impl_u!([u32; 16]: u32x16, m32x16 | u32, u16 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: u8x16, u16x16 |
/// A 512-bit vector with 16 `u32` lanes.
);
impl_f!([f32; 16]: f32x16, m32x16 | f32 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: i8x16, u8x16, i16x16, u16x16 |
/// A 512-bit vector with 16 `f32` lanes.
);
-impl_m!([m32; 16]: m32x16 | i32 | test_v512 |
+impl_m!([m32; 16]: m32x16 | i32, u16 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15 |
From: m8x16, m16x16 |
/// A 512-bit vector mask with 16 `m32` lanes.
);
-impl_i!([i64; 8]: i64x8, m64x8 | i64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_i!([i64; 8]: i64x8, m64x8 | i64, u8 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: i8x8, u8x8, i16x8, u16x8, i32x8, u32x8 |
/// A 512-bit vector with 8 `i64` lanes.
);
-impl_u!([u64; 8]: u64x8, m64x8 | u64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_u!([u64; 8]: u64x8, m64x8 | u64, u8 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: u8x8, u16x8, u32x8 |
/// A 512-bit vector with 8 `u64` lanes.
);
impl_f!([f64; 8]: f64x8, m64x8 | f64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: i8x8, u8x8, i16x8, u16x8, i32x8, u32x8, f32x8 |
/// A 512-bit vector with 8 `f64` lanes.
);
-impl_m!([m64; 8]: m64x8 | i64 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_m!([m64; 8]: m64x8 | i64, u8 | test_v512 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: m8x8, m16x8, m32x8 |
/// A 512-bit vector mask with 8 `m64` lanes.
);
-impl_i!([i128; 4]: i128x4, m128x4 | i128 | test_v512 | x0, x1, x2, x3 |
+impl_i!([i128; 4]: i128x4, m128x4 | i128, u8 | test_v512 | x0, x1, x2, x3 |
From: i8x4, u8x4, i16x4, u16x4, i32x4, u32x4, i64x4, u64x4 |
/// A 512-bit vector with 4 `i128` lanes.
);
-impl_u!([u128; 4]: u128x4, m128x4 | u128 | test_v512 | x0, x1, x2, x3 |
+impl_u!([u128; 4]: u128x4, m128x4 | u128, u8 | test_v512 | x0, x1, x2, x3 |
From: u8x4, u16x4, u32x4, u64x4 |
/// A 512-bit vector with 4 `u128` lanes.
);
-impl_m!([m128; 4]: m128x4 | i128 | test_v512 | x0, x1, x2, x3 |
+impl_m!([m128; 4]: m128x4 | i128, u8 | test_v512 | x0, x1, x2, x3 |
From: m8x4, m16x4, m32x4, m64x4 |
/// A 512-bit vector mask with 4 `m128` lanes.
);
diff --git a/third_party/rust/packed_simd/src/v64.rs b/third_party/rust/packed_simd/src/v64.rs
--- a/third_party/rust/packed_simd/src/v64.rs
+++ b/third_party/rust/packed_simd/src/v64.rs
@@ -1,66 +1,66 @@
//! 64-bit wide vector types
-#![rustfmt::skip]
+#[rustfmt::skip]
use super::*;
-impl_i!([i8; 8]: i8x8, m8x8 | i8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_i!([i8; 8]: i8x8, m8x8 | i8, u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: |
/// A 64-bit vector with 8 `i8` lanes.
);
-impl_u!([u8; 8]: u8x8, m8x8 | u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_u!([u8; 8]: u8x8, m8x8 | u8, u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: |
/// A 64-bit vector with 8 `u8` lanes.
);
-impl_m!([m8; 8]: m8x8 | i8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
+impl_m!([m8; 8]: m8x8 | i8, u8 | test_v64 | x0, x1, x2, x3, x4, x5, x6, x7 |
From: m16x8, m32x8 |
/// A 64-bit vector mask with 8 `m8` lanes.
);
-impl_i!([i16; 4]: i16x4, m16x4 | i16 | test_v64 | x0, x1, x2, x3 |
+impl_i!([i16; 4]: i16x4, m16x4 | i16, u8 | test_v64 | x0, x1, x2, x3 |
From: i8x4, u8x4 |
/// A 64-bit vector with 4 `i16` lanes.
);
-impl_u!([u16; 4]: u16x4, m16x4 | u16 | test_v64 | x0, x1, x2, x3 |
+impl_u!([u16; 4]: u16x4, m16x4 | u16, u8 | test_v64 | x0, x1, x2, x3 |
From: u8x4 |
/// A 64-bit vector with 4 `u16` lanes.
);
-impl_m!([m16; 4]: m16x4 | i16 | test_v64 | x0, x1, x2, x3 |
+impl_m!([m16; 4]: m16x4 | i16, u8 | test_v64 | x0, x1, x2, x3 |
From: m8x4, m32x4, m64x4 |
/// A 64-bit vector mask with 4 `m16` lanes.
);
-impl_i!([i32; 2]: i32x2, m32x2 | i32 | test_v64 | x0, x1 |
+impl_i!([i32; 2]: i32x2, m32x2 | i32, u8 | test_v64 | x0, x1 |
From: i8x2, u8x2, i16x2, u16x2 |
/// A 64-bit vector with 2 `i32` lanes.
);
-impl_u!([u32; 2]: u32x2, m32x2 | u32 | test_v64 | x0, x1 |
+impl_u!([u32; 2]: u32x2, m32x2 | u32, u8 | test_v64 | x0, x1 |
From: u8x2, u16x2 |
/// A 64-bit vector with 2 `u32` lanes.
);
-impl_m!([m32; 2]: m32x2 | i32 | test_v64 | x0, x1 |
+impl_m!([m32; 2]: m32x2 | i32, u8 | test_v64 | x0, x1 |
From: m8x2, m16x2, m64x2, m128x2 |
/// A 64-bit vector mask with 2 `m32` lanes.
);
impl_f!([f32; 2]: f32x2, m32x2 | f32 | test_v64 | x0, x1 |
From: i8x2, u8x2, i16x2, u16x2 |
/// A 64-bit vector with 2 `f32` lanes.
);
/*
-impl_i!([i64; 1]: i64x1, m64x1 | i64 | test_v64 | x0 |
+impl_i!([i64; 1]: i64x1, m64x1 | i64, u8 | test_v64 | x0 |
From: /*i8x1, u8x1, i16x1, u16x1, i32x1, u32x1*/ | // FIXME: primitive to vector conversion
/// A 64-bit vector with 1 `i64` lanes.
);
-impl_u!([u64; 1]: u64x1, m64x1 | u64 | test_v64 | x0 |
+impl_u!([u64; 1]: u64x1, m64x1 | u64, u8 | test_v64 | x0 |
From: /*u8x1, u16x1, u32x1*/ | // FIXME: primitive to vector conversion
/// A 64-bit vector with 1 `u64` lanes.
);
-impl_m!([m64; 1]: m64x1 | i64 | test_v64 | x0 |
+impl_m!([m64; 1]: m64x1 | i64, u8 | test_v64 | x0 |
From: /*m8x1, m16x1, m32x1, */ m128x1 | // FIXME: unary small vector types
/// A 64-bit vector mask with 1 `m64` lanes.
);
impl_f!([f64; 1]: f64x1, m64x1 | f64 | test_v64 | x0 |
From: /*i8x1, u8x1, i16x1, u16x1, i32x1, u32x1, f32x1*/ | // FIXME: unary small vector types
/// A 64-bit vector with 1 `f64` lanes.
);
*/
diff --git a/third_party/rust/packed_simd/src/vPtr.rs b/third_party/rust/packed_simd/src/vPtr.rs
--- a/third_party/rust/packed_simd/src/vPtr.rs
+++ b/third_party/rust/packed_simd/src/vPtr.rs
@@ -1,10 +1,10 @@
//! Vectors of pointers
-#![rustfmt::skip]
+#[rustfmt::skip]
use crate::*;
impl_const_p!(
[*const T; 2]: cptrx2, msizex2, usizex2, isizex2 | test_v128 | x0, x1 | From: |
/// A vector with 2 `*const T` lanes
);
diff --git a/third_party/rust/packed_simd/src/vSize.rs b/third_party/rust/packed_simd/src/vSize.rs
--- a/third_party/rust/packed_simd/src/vSize.rs
+++ b/third_party/rust/packed_simd/src/vSize.rs
@@ -1,53 +1,53 @@
//! Vectors with pointer-sized elements
use crate::codegen::pointer_sized_int::{isize_, usize_};
use crate::*;
-impl_i!([isize; 2]: isizex2, msizex2 | isize_ | test_v128 |
+impl_i!([isize; 2]: isizex2, msizex2 | isize_, u8 | test_v128 |
x0, x1|
From: |
/// A vector with 2 `isize` lanes.
);
-impl_u!([usize; 2]: usizex2, msizex2 | usize_ | test_v128 |
+impl_u!([usize; 2]: usizex2, msizex2 | usize_, u8 | test_v128 |
x0, x1|
From: |
/// A vector with 2 `usize` lanes.
);
-impl_m!([msize; 2]: msizex2 | isize_ | test_v128 |
+impl_m!([msize; 2]: msizex2 | isize_, u8 | test_v128 |
x0, x1 |
From: |
/// A vector mask with 2 `msize` lanes.
);
-impl_i!([isize; 4]: isizex4, msizex4 | isize_ | test_v256 |
+impl_i!([isize; 4]: isizex4, msizex4 | isize_, u8 | test_v256 |
x0, x1, x2, x3 |
From: |
/// A vector with 4 `isize` lanes.
);
-impl_u!([usize; 4]: usizex4, msizex4 | usize_ | test_v256 |
+impl_u!([usize; 4]: usizex4, msizex4 | usize_, u8 | test_v256 |
x0, x1, x2, x3|
From: |
/// A vector with 4 `usize` lanes.
);
-impl_m!([msize; 4]: msizex4 | isize_ | test_v256 |
+impl_m!([msize; 4]: msizex4 | isize_, u8 | test_v256 |
x0, x1, x2, x3 |
From: |
/// A vector mask with 4 `msize` lanes.
);
-impl_i!([isize; 8]: isizex8, msizex8 | isize_ | test_v512 |
+impl_i!([isize; 8]: isizex8, msizex8 | isize_, u8 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7 |
From: |
- /// A vector with 4 `isize` lanes.
+ /// A vector with 8 `isize` lanes.
);
-impl_u!([usize; 8]: usizex8, msizex8 | usize_ | test_v512 |
+impl_u!([usize; 8]: usizex8, msizex8 | usize_, u8 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7 |
From: |
/// A vector with 8 `usize` lanes.
);
-impl_m!([msize; 8]: msizex8 | isize_ | test_v512 |
+impl_m!([msize; 8]: msizex8 | isize_, u8 | test_v512 |
x0, x1, x2, x3, x4, x5, x6, x7 |
From: |
/// A vector mask with 8 `msize` lanes.
);
diff --git a/third_party/rust/packed_simd/tests/endianness.rs b/third_party/rust/packed_simd/tests/endianness.rs
--- a/third_party/rust/packed_simd/tests/endianness.rs
+++ b/third_party/rust/packed_simd/tests/endianness.rs
@@ -12,51 +12,51 @@ fn endian_indexing() {
assert_eq!(v.extract(1), 1);
assert_eq!(v.extract(2), 2);
assert_eq!(v.extract(3), 3);
}
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn endian_bitcasts() {
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let x = i8x16::new(
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
);
let t: i16x8 = unsafe { mem::transmute(x) };
let e: i16x8 = if cfg!(target_endian = "little") {
i16x8::new(256, 770, 1284, 1798, 2312, 2826, 3340, 3854)
} else {
i16x8::new(1, 515, 1029, 1543, 2057, 2571, 3085, 3599)
};
assert_eq!(t, e);
}
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn endian_casts() {
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let x = i8x16::new(
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
);
let t: i16x16 = x.into(); // simd_cast
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let e = i16x16::new(
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
);
assert_eq!(t, e);
}
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn endian_load_and_stores() {
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let x = i8x16::new(
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
);
let mut y: [i16; 8] = [0; 8];
x.write_to_slice_unaligned(unsafe {
slice::from_raw_parts_mut(&mut y as *mut _ as *mut i8, 16)
});
@@ -77,56 +77,61 @@ fn endian_load_and_stores() {
#[cfg_attr(not(target_arch = "wasm32"), test)]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn endian_array_union() {
union A {
data: [f32; 4],
vec: f32x4,
}
let x: [f32; 4] = unsafe { A { vec: f32x4::new(0., 1., 2., 3.) }.data };
- assert_eq!(x[0], 0_f32);
- assert_eq!(x[1], 1_f32);
- assert_eq!(x[2], 2_f32);
- assert_eq!(x[3], 3_f32);
+ // As all of these are integer values within the mantissa^1 range, it
+ // would be very unusual for them to actually fail to compare.
+ #[allow(clippy::float_cmp)]
+ {
+ assert_eq!(x[0], 0_f32);
+ assert_eq!(x[1], 1_f32);
+ assert_eq!(x[2], 2_f32);
+ assert_eq!(x[3], 3_f32);
+ }
let y: f32x4 = unsafe { A { data: [3., 2., 1., 0.] }.vec };
assert_eq!(y, f32x4::new(3., 2., 1., 0.));
union B {
data: [i8; 16],
vec: i8x16,
}
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let x = i8x16::new(
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
);
let x: [i8; 16] = unsafe { B { vec: x }.data };
- for i in 0..16 {
- assert_eq!(x[i], i as i8);
+ for (i, v) in x.iter().enumerate() {
+ assert_eq!(i as i8, *v);
}
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let y = [
15, 14, 13, 12, 11, 19, 9, 8,
7, 6, 5, 4, 3, 2, 1, 0
];
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let e = i8x16::new(
15, 14, 13, 12, 11, 19, 9, 8,
7, 6, 5, 4, 3, 2, 1, 0
);
let z = unsafe { B { data: y }.vec };
assert_eq!(z, e);
union C {
data: [i16; 8],
vec: i8x16,
}
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let x = i8x16::new(
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
);
let x: [i16; 8] = unsafe { C { vec: x }.data };
let e: [i16; 8] = if cfg!(target_endian = "little") {
[256, 770, 1284, 1798, 2312, 2826, 3340, 3854]
@@ -140,31 +145,36 @@ fn endian_array_union() {
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
fn endian_tuple_access() {
type F32x4T = (f32, f32, f32, f32);
union A {
data: F32x4T,
vec: f32x4,
}
let x: F32x4T = unsafe { A { vec: f32x4::new(0., 1., 2., 3.) }.data };
- assert_eq!(x.0, 0_f32);
- assert_eq!(x.1, 1_f32);
- assert_eq!(x.2, 2_f32);
- assert_eq!(x.3, 3_f32);
+ // As all of these are integer values within the mantissa^1 range, it
+ // would be very unusual for them to actually fail to compare.
+ #[allow(clippy::float_cmp)]
+ {
+ assert_eq!(x.0, 0_f32);
+ assert_eq!(x.1, 1_f32);
+ assert_eq!(x.2, 2_f32);
+ assert_eq!(x.3, 3_f32);
+ }
let y: f32x4 = unsafe { A { data: (3., 2., 1., 0.) }.vec };
assert_eq!(y, f32x4::new(3., 2., 1., 0.));
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
type I8x16T = (i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8);
union B {
data: I8x16T,
vec: i8x16,
}
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let x = i8x16::new(
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
);
let x: I8x16T = unsafe { B { vec: x }.data };
assert_eq!(x.0, 0);
assert_eq!(x.1, 1);
@@ -178,37 +188,37 @@ fn endian_tuple_access() {
assert_eq!(x.9, 9);
assert_eq!(x.10, 10);
assert_eq!(x.11, 11);
assert_eq!(x.12, 12);
assert_eq!(x.13, 13);
assert_eq!(x.14, 14);
assert_eq!(x.15, 15);
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let y = (
15, 14, 13, 12, 11, 10, 9, 8,
7, 6, 5, 4, 3, 2, 1, 0
);
let z: i8x16 = unsafe { B { data: y }.vec };
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let e = i8x16::new(
15, 14, 13, 12, 11, 10, 9, 8,
7, 6, 5, 4, 3, 2, 1, 0
);
assert_eq!(e, z);
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
type I16x8T = (i16, i16, i16, i16, i16, i16, i16, i16);
union C {
data: I16x8T,
vec: i8x16,
}
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let x = i8x16::new(
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
);
let x: I16x8T = unsafe { C { vec: x }.data };
let e: [i16; 8] = if cfg!(target_endian = "little") {
[256, 770, 1284, 1798, 2312, 2826, 3340, 3854]
@@ -219,28 +229,28 @@ fn endian_tuple_access() {
assert_eq!(x.1, e[1]);
assert_eq!(x.2, e[2]);
assert_eq!(x.3, e[3]);
assert_eq!(x.4, e[4]);
assert_eq!(x.5, e[5]);
assert_eq!(x.6, e[6]);
assert_eq!(x.7, e[7]);
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
#[repr(C)]
#[derive(Copy ,Clone)]
pub struct Tup(pub i8, pub i8, pub i16, pub i8, pub i8, pub i16,
pub i8, pub i8, pub i16, pub i8, pub i8, pub i16);
union D {
data: Tup,
vec: i8x16,
}
- #[cfg_attr(rustfmt, rustfmt_skip)]
+ #[rustfmt::skip]
let x = i8x16::new(
0, 1, 2, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15,
);
let x: Tup = unsafe { D { vec: x }.data };
let e: [i16; 12] = if cfg!(target_endian = "little") {
[0, 1, 770, 4, 5, 1798, 8, 9, 2826, 12, 13, 3854]
Reference in a new issue Copy permalink