about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-09-21 00:43:26 +0000
committerbors <bors@rust-lang.org>2020-09-21 00:43:26 +0000
commit0f9f0b384a0a3c997c1ea8f838f5591f12f96633 (patch)
tree0772cef9c4a3cf1990c4ad9c28a14814bd839d30 /src
parent7467d17bb94d388a056526dd143ce43612296ce6 (diff)
parent5de2c95e6e8352d2e45111025a57bd1e67a43a79 (diff)
Auto merge of #76295 - mati865:remove-mmx, r=Amanieu,oli-obk
Remove MMX from Rust

Follow-up to https://github.com/rust-lang/stdarch/pull/890
This removes most of MMX from Rust (tests pass with small changes), keeping stable `is_x86_feature_detected!("mmx")` working.
Diffstat (limited to 'src')
-rw-r--r--src/test/codegen/x86_mmx.rs27
-rw-r--r--src/test/ui/auxiliary/using-target-feature-unstable.rs4
-rw-r--r--src/test/ui/target-feature/gate.rs4
-rw-r--r--src/test/ui/target-feature/gate.stderr2
4 files changed, 4 insertions, 33 deletions
diff --git a/src/test/codegen/x86_mmx.rs b/src/test/codegen/x86_mmx.rs
deleted file mode 100644
index 9a58ef1c37a..00000000000
--- a/src/test/codegen/x86_mmx.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// ignore-arm
-// ignore-aarch64
-// ignore-emscripten
-// ignore-mips
-// ignore-mips64
-// ignore-powerpc
-// ignore-powerpc64
-// ignore-powerpc64le
-// ignore-riscv64
-// ignore-sparc
-// ignore-sparc64
-// ignore-s390x
-// compile-flags: -O
-
-#![feature(repr_simd)]
-#![crate_type="lib"]
-
-#[repr(simd)]
-#[derive(Clone, Copy)]
-pub struct i8x8(u64);
-
-#[no_mangle]
-pub fn a(a: &mut i8x8, b: i8x8) -> i8x8 {
-    // CHECK-LABEL: define void @a(x86_mmx*{{.*}}, x86_mmx*{{.*}}, x86_mmx*{{.*}})
-    *a = b;
-    return b
-}
diff --git a/src/test/ui/auxiliary/using-target-feature-unstable.rs b/src/test/ui/auxiliary/using-target-feature-unstable.rs
index 78645c284f1..2682028936c 100644
--- a/src/test/ui/auxiliary/using-target-feature-unstable.rs
+++ b/src/test/ui/auxiliary/using-target-feature-unstable.rs
@@ -1,5 +1,5 @@
-#![feature(mmx_target_feature)]
+#![feature(avx512_target_feature)]
 
 #[inline]
-#[target_feature(enable = "mmx")]
+#[target_feature(enable = "avx512ifma")]
 pub unsafe fn foo() {}
diff --git a/src/test/ui/target-feature/gate.rs b/src/test/ui/target-feature/gate.rs
index 10fbba36d3f..e4b78c76e16 100644
--- a/src/test/ui/target-feature/gate.rs
+++ b/src/test/ui/target-feature/gate.rs
@@ -19,7 +19,6 @@
 // gate-test-aarch64_target_feature
 // gate-test-hexagon_target_feature
 // gate-test-mips_target_feature
-// gate-test-mmx_target_feature
 // gate-test-wasm_target_feature
 // gate-test-adx_target_feature
 // gate-test-cmpxchg16b_target_feature
@@ -30,7 +29,6 @@
 
 #[target_feature(enable = "avx512bw")]
 //~^ ERROR: currently unstable
-unsafe fn foo() {
-}
+unsafe fn foo() {}
 
 fn main() {}
diff --git a/src/test/ui/target-feature/gate.stderr b/src/test/ui/target-feature/gate.stderr
index 2d6abcc0a01..2384a00aa47 100644
--- a/src/test/ui/target-feature/gate.stderr
+++ b/src/test/ui/target-feature/gate.stderr
@@ -1,5 +1,5 @@
 error[E0658]: the target feature `avx512bw` is currently unstable
-  --> $DIR/gate.rs:31:18
+  --> $DIR/gate.rs:30:18
    |
 LL | #[target_feature(enable = "avx512bw")]
    |                  ^^^^^^^^^^^^^^^^^^^