diff --git a/cranelift/filetests/filetests/isa/x64/bextend.clif b/cranelift/filetests/filetests/isa/x64/bextend.clif
index 6b53f3c3bd..8678e7f66a 100644
--- a/cranelift/filetests/filetests/isa/x64/bextend.clif
+++ b/cranelift/filetests/filetests/isa/x64/bextend.clif
@@ -1,5 +1,5 @@
 test compile
-target x86_64 machinst
+target x86_64
 
 function %f0(b8) -> b64 {
 block0(v0: b8):
diff --git a/cranelift/filetests/filetests/runtests/alias.clif b/cranelift/filetests/filetests/runtests/alias.clif
index cf5e99ca95..61ee5af491 100644
--- a/cranelift/filetests/filetests/runtests/alias.clif
+++ b/cranelift/filetests/filetests/runtests/alias.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 target s390x
-target x86_64 machinst
+target x86_64
 
 function %alias(i8) -> i8 {
 block0(v0: i8):
diff --git a/cranelift/filetests/filetests/runtests/arithmetic.clif b/cranelift/filetests/filetests/runtests/arithmetic.clif
index c3cfe07c4c..28936f45e4 100644
--- a/cranelift/filetests/filetests/runtests/arithmetic.clif
+++ b/cranelift/filetests/filetests/runtests/arithmetic.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 target s390x
-target x86_64 machinst
+target x86_64
 
 function %add_i64(i64, i64) -> i64 {
 block0(v0: i64,v1: i64):
diff --git a/cranelift/filetests/filetests/runtests/atomic-rmw-2.clif b/cranelift/filetests/filetests/runtests/atomic-rmw-2.clif
index f48f4a953e..b697a9279e 100644
--- a/cranelift/filetests/filetests/runtests/atomic-rmw-2.clif
+++ b/cranelift/filetests/filetests/runtests/atomic-rmw-2.clif
@@ -1,7 +1,7 @@
 test run
 target aarch64
 target aarch64 has_lse
-target x86_64 machinst
+target x86_64
 ; TODO: Merge this with atomic-rmw.clif when s390x supports it
 
 
diff --git a/cranelift/filetests/filetests/runtests/atomic-rmw.clif b/cranelift/filetests/filetests/runtests/atomic-rmw.clif
index f96f645c33..57e18a0dbe 100644
--- a/cranelift/filetests/filetests/runtests/atomic-rmw.clif
+++ b/cranelift/filetests/filetests/runtests/atomic-rmw.clif
@@ -1,7 +1,7 @@
 test run
 target aarch64
 target aarch64 has_lse
-target x86_64 machinst
+target x86_64
 target s390x
 
 ; We can't test that these instructions are right regarding atomicity, but we can
diff --git a/cranelift/filetests/filetests/runtests/bint.clif b/cranelift/filetests/filetests/runtests/bint.clif
index 30bb91be11..cce35d1c7f 100644
--- a/cranelift/filetests/filetests/runtests/bint.clif
+++ b/cranelift/filetests/filetests/runtests/bint.clif
@@ -1,6 +1,6 @@
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %bint_b8_i16_true() -> i16 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/bitops.clif b/cranelift/filetests/filetests/runtests/bitops.clif
index f84e276f47..1524e04bb5 100644
--- a/cranelift/filetests/filetests/runtests/bitops.clif
+++ b/cranelift/filetests/filetests/runtests/bitops.clif
@@ -2,8 +2,7 @@ test run
 target aarch64
 target arm
 target s390x
-; target x86_64 machinst TODO: Not yet implemented on x86_64
-target x86_64 legacy
+; target x86_64 TODO: Not yet implemented on x86_64
 
 
 function %bnot_band() -> b1 {
diff --git a/cranelift/filetests/filetests/runtests/br.clif b/cranelift/filetests/filetests/runtests/br.clif
index 2d56d9ae95..b6c1f1d282 100644
--- a/cranelift/filetests/filetests/runtests/br.clif
+++ b/cranelift/filetests/filetests/runtests/br.clif
@@ -3,8 +3,7 @@ test run
 target aarch64
 target arm
 target s390x
-target x86_64 machinst
-target x86_64 legacy
+target x86_64
 
 function %jump() -> b1 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/br_icmp.clif b/cranelift/filetests/filetests/runtests/br_icmp.clif
index cfb448a33b..0806ff1adb 100644
--- a/cranelift/filetests/filetests/runtests/br_icmp.clif
+++ b/cranelift/filetests/filetests/runtests/br_icmp.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 target s390x
-target x86_64 machinst
+target x86_64
 
 
 function %bricmp_eq_i64(i64, i64) -> b1 {
diff --git a/cranelift/filetests/filetests/runtests/br_icmp_overflow.clif b/cranelift/filetests/filetests/runtests/br_icmp_overflow.clif
index 71c3a43169..d05b83251d 100644
--- a/cranelift/filetests/filetests/runtests/br_icmp_overflow.clif
+++ b/cranelift/filetests/filetests/runtests/br_icmp_overflow.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 ; TODO: Merge this with the main br_icmp file when s390x supports overflows.
 ; See: https://github.com/bytecodealliance/wasmtime/issues/3060
diff --git a/cranelift/filetests/filetests/runtests/br_table.clif b/cranelift/filetests/filetests/runtests/br_table.clif
index 16718d4e76..e58dda3cfe 100644
--- a/cranelift/filetests/filetests/runtests/br_table.clif
+++ b/cranelift/filetests/filetests/runtests/br_table.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 target s390x
 
 
diff --git a/cranelift/filetests/filetests/runtests/const.clif b/cranelift/filetests/filetests/runtests/const.clif
index b3067c6d8a..ec91e171bb 100644
--- a/cranelift/filetests/filetests/runtests/const.clif
+++ b/cranelift/filetests/filetests/runtests/const.clif
@@ -2,8 +2,7 @@ test run
 target aarch64
 target arm
 target s390x
-target x86_64 machinst
-target x86_64 legacy
+target x86_64
 
 function %i8_iconst_0() -> i8 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/div-checks.clif b/cranelift/filetests/filetests/runtests/div-checks.clif
index 7e362598d1..beb1a077ff 100644
--- a/cranelift/filetests/filetests/runtests/div-checks.clif
+++ b/cranelift/filetests/filetests/runtests/div-checks.clif
@@ -3,7 +3,7 @@ target aarch64
 target arm
 target s390x
 set avoid_div_traps=false
-target x86_64 machinst
+target x86_64
 
 function %i8(i8, i8) -> i8 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/extend.clif b/cranelift/filetests/filetests/runtests/extend.clif
index 69be211032..dc89220aa4 100644
--- a/cranelift/filetests/filetests/runtests/extend.clif
+++ b/cranelift/filetests/filetests/runtests/extend.clif
@@ -2,8 +2,7 @@ test run
 target aarch64
 target arm
 target s390x
-; target x86_64 machinst TODO: Not yet implemented on x86_64
-target i686 legacy
+; target x86_64 TODO: Not yet implemented on x86_64
 
 function %uextend() -> b1 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/fmin-max-pseudo-vector.clif b/cranelift/filetests/filetests/runtests/fmin-max-pseudo-vector.clif
index 5bd7b07ada..9bbba57559 100644
--- a/cranelift/filetests/filetests/runtests/fmin-max-pseudo-vector.clif
+++ b/cranelift/filetests/filetests/runtests/fmin-max-pseudo-vector.clif
@@ -2,7 +2,7 @@ test run
 ; target s390x TODO: Not yet implemented on s390x
 set enable_simd
 target aarch64
-target x86_64 machinst skylake
+target x86_64 skylake
 
 function %fmin_pseudo_f32x4(f32x4, f32x4) -> f32x4 {
 block0(v0:f32x4, v1:f32x4):
diff --git a/cranelift/filetests/filetests/runtests/fmin-max-pseudo.clif b/cranelift/filetests/filetests/runtests/fmin-max-pseudo.clif
index 7fd70504f1..628dcc15a9 100644
--- a/cranelift/filetests/filetests/runtests/fmin-max-pseudo.clif
+++ b/cranelift/filetests/filetests/runtests/fmin-max-pseudo.clif
@@ -2,7 +2,7 @@ test run
 ; target s390x TODO: Not yet implemented on s390x
 target aarch64
 set enable_simd
-target x86_64 machinst skylake
+target x86_64 skylake
 
 function %fmin_pseudo_f32(f32, f32) -> f32 {
 block0(v0:f32, v1:f32):
diff --git a/cranelift/filetests/filetests/runtests/heap.clif b/cranelift/filetests/filetests/runtests/heap.clif
index b203705131..35d80a5151 100644
--- a/cranelift/filetests/filetests/runtests/heap.clif
+++ b/cranelift/filetests/filetests/runtests/heap.clif
@@ -1,5 +1,5 @@
 test run
-target x86_64 machinst
+target x86_64
 target s390x
 target aarch64
 
diff --git a/cranelift/filetests/filetests/runtests/i128-arithmetic-legacy.clif b/cranelift/filetests/filetests/runtests/i128-arithmetic-legacy.clif
deleted file mode 100644
index d5590b2564..0000000000
--- a/cranelift/filetests/filetests/runtests/i128-arithmetic-legacy.clif
+++ /dev/null
@@ -1,20 +0,0 @@
-test run
-target x86_64 legacy haswell
-
-function %test_imul_i128() -> b1 {
-block0:
-    v11 = iconst.i64 0xf2347ac4503f1e24
-    v12 = iconst.i64 0x0098fe985354ab06
-    v1 = iconcat v11, v12
-    v21 = iconst.i64 0xf606ba453589ef89
-    v22 = iconst.i64 0x042e1f3054ca7432
-    v2 = iconcat v21, v22
-    v31 = iconst.i64 0xbe2044b2742ebd44
-    v32 = iconst.i64 0xa363ce3b6849f307
-    v3 = iconcat v31, v32
-    v4 = imul v1, v2
-    v5 = icmp eq v3, v4
-    return v5
-}
-
-; run
diff --git a/cranelift/filetests/filetests/runtests/i128-arithmetic.clif b/cranelift/filetests/filetests/runtests/i128-arithmetic.clif
index f891239155..da51097ec4 100644
--- a/cranelift/filetests/filetests/runtests/i128-arithmetic.clif
+++ b/cranelift/filetests/filetests/runtests/i128-arithmetic.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %add_i128(i128, i128) -> i128 {
 block0(v0: i128,v1: i128):
diff --git a/cranelift/filetests/filetests/runtests/i128-bint.clif b/cranelift/filetests/filetests/runtests/i128-bint.clif
index f959af583b..83c9152d51 100644
--- a/cranelift/filetests/filetests/runtests/i128-bint.clif
+++ b/cranelift/filetests/filetests/runtests/i128-bint.clif
@@ -1,7 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %bint_b8_i128() -> i128 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/i128-bitops-count.clif b/cranelift/filetests/filetests/runtests/i128-bitops-count.clif
index 627dbf3e91..60d74e874b 100644
--- a/cranelift/filetests/filetests/runtests/i128-bitops-count.clif
+++ b/cranelift/filetests/filetests/runtests/i128-bitops-count.clif
@@ -1,7 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %ctz_i128(i128) -> i128 {
 block0(v0: i128):
diff --git a/cranelift/filetests/filetests/runtests/i128-bitops.clif b/cranelift/filetests/filetests/runtests/i128-bitops.clif
index 4a86f43fe5..72db60a970 100644
--- a/cranelift/filetests/filetests/runtests/i128-bitops.clif
+++ b/cranelift/filetests/filetests/runtests/i128-bitops.clif
@@ -1,7 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %bnot_i128(i128) -> i128 {
 block0(v0: i128):
diff --git a/cranelift/filetests/filetests/runtests/i128-bitrev.clif b/cranelift/filetests/filetests/runtests/i128-bitrev.clif
index 5e30ad90fd..c685c45ee0 100644
--- a/cranelift/filetests/filetests/runtests/i128-bitrev.clif
+++ b/cranelift/filetests/filetests/runtests/i128-bitrev.clif
@@ -1,8 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
-target x86_64 legacy
+target x86_64
 
 function %reverse_bits_zero() -> b1 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/i128-br.clif b/cranelift/filetests/filetests/runtests/i128-br.clif
index d755a5bd06..0ed0e9caf2 100644
--- a/cranelift/filetests/filetests/runtests/i128-br.clif
+++ b/cranelift/filetests/filetests/runtests/i128-br.clif
@@ -1,8 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
-target x86_64 legacy
+target x86_64
 
 
 function %i128_brz(i128) -> b1 {
diff --git a/cranelift/filetests/filetests/runtests/i128-concat-split.clif b/cranelift/filetests/filetests/runtests/i128-concat-split.clif
index 56abdddca5..1559148c81 100644
--- a/cranelift/filetests/filetests/runtests/i128-concat-split.clif
+++ b/cranelift/filetests/filetests/runtests/i128-concat-split.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %iconcat_isplit(i64, i64) -> i64, i64 {
 block0(v0: i64, v1: i64):
diff --git a/cranelift/filetests/filetests/runtests/i128-const.clif b/cranelift/filetests/filetests/runtests/i128-const.clif
index 65975c680c..379a928b45 100644
--- a/cranelift/filetests/filetests/runtests/i128-const.clif
+++ b/cranelift/filetests/filetests/runtests/i128-const.clif
@@ -3,7 +3,7 @@ test run
 set enable_llvm_abi_extensions=true
 target aarch64
 ; target s390x TODO: Not yet implemented on s390x
-target x86_64 machinst
+target x86_64
 
 function %i128_const_0() -> i128 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/i128-extend-2.clif b/cranelift/filetests/filetests/runtests/i128-extend-2.clif
deleted file mode 100644
index 0d5ce42a58..0000000000
--- a/cranelift/filetests/filetests/runtests/i128-extend-2.clif
+++ /dev/null
@@ -1,64 +0,0 @@
-test run
-set enable_llvm_abi_extensions=true
-target aarch64
-target x86_64 machinst
-; TODO:  Merge this file with i128-extend once the x86 legacy backend is removed
-
-function %i128_uextend_i32(i32) -> i128 {
-block0(v0: i32):
-    v1 = uextend.i128 v0
-    return v1
-}
-; run: %i128_uextend_i32(0) == 0
-; run: %i128_uextend_i32(-1) == 0x00000000_00000000_00000000_ffffffff
-; run: %i128_uextend_i32(0xffff_eeee) == 0x00000000_00000000_00000000_ffffeeee
-
-function %i128_sextend_i32(i32) -> i128 {
-block0(v0: i32):
-    v1 = sextend.i128 v0
-    return v1
-}
-; run: %i128_sextend_i32(0) == 0
-; run: %i128_sextend_i32(-1) == -1
-; run: %i128_sextend_i32(0x7fff_ffff) == 0x00000000_00000000_00000000_7fffffff
-; run: %i128_sextend_i32(0xffff_eeee) == 0xffffffff_ffffffff_ffffffff_ffff_eeee
-
-
-function %i128_uextend_i16(i16) -> i128 {
-block0(v0: i16):
-    v1 = uextend.i128 v0
-    return v1
-}
-; run: %i128_uextend_i16(0) == 0
-; run: %i128_uextend_i16(-1) == 0x00000000_00000000_00000000_0000ffff
-; run: %i128_uextend_i16(0xffee) == 0x00000000_00000000_00000000_0000ffee
-
-function %i128_sextend_i16(i16) -> i128 {
-block0(v0: i16):
-    v1 = sextend.i128 v0
-    return v1
-}
-; run: %i128_sextend_i16(0) == 0
-; run: %i128_sextend_i16(-1) == -1
-; run: %i128_sextend_i16(0x7fff) == 0x00000000_00000000_00000000_00007fff
-; run: %i128_sextend_i16(0xffee) == 0xffffffff_ffffffff_ffffffff_ffffffee
-
-
-function %i128_uextend_i8(i8) -> i128 {
-block0(v0: i8):
-    v1 = uextend.i128 v0
-    return v1
-}
-; run: %i128_uextend_i8(0) == 0
-; run: %i128_uextend_i8(-1) == 0x00000000_00000000_00000000_000000ff
-; run: %i128_uextend_i8(0xfe) == 0x00000000_00000000_00000000_000000fe
-
-function %i128_sextend_i8(i8) -> i128 {
-block0(v0: i8):
-    v1 = sextend.i128 v0
-    return v1
-}
-; run: %i128_sextend_i8(0) == 0
-; run: %i128_sextend_i8(-1) == -1
-; run: %i128_sextend_i8(0x7f) == 0x00000000_00000000_00000000_0000007f
-; run: %i128_sextend_i8(0xfe) == 0xffffffff_ffffffff_ffffffff_fffffffe
diff --git a/cranelift/filetests/filetests/runtests/i128-extend.clif b/cranelift/filetests/filetests/runtests/i128-extend.clif
index 1789299479..a0d1b67276 100644
--- a/cranelift/filetests/filetests/runtests/i128-extend.clif
+++ b/cranelift/filetests/filetests/runtests/i128-extend.clif
@@ -1,8 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
-target x86_64 legacy
+target x86_64
 
 function %i128_uextend_i64(i64) -> i128 {
 block0(v0: i64):
@@ -22,3 +21,62 @@ block0(v0: i64):
 ; run: %i128_sextend_i64(-1) == -1
 ; run: %i128_sextend_i64(0x7fff_ffff_ffff_ffff) == 0x00000000_00000000_7fffffffffffffff
 ; run: %i128_sextend_i64(0xffff_ffff_eeee_0000) == 0xffffffff_ffffffff_ffffffff_eeee0000
+
+function %i128_uextend_i32(i32) -> i128 {
+block0(v0: i32):
+    v1 = uextend.i128 v0
+    return v1
+}
+; run: %i128_uextend_i32(0) == 0
+; run: %i128_uextend_i32(-1) == 0x00000000_00000000_00000000_ffffffff
+; run: %i128_uextend_i32(0xffff_eeee) == 0x00000000_00000000_00000000_ffffeeee
+
+function %i128_sextend_i32(i32) -> i128 {
+block0(v0: i32):
+    v1 = sextend.i128 v0
+    return v1
+}
+; run: %i128_sextend_i32(0) == 0
+; run: %i128_sextend_i32(-1) == -1
+; run: %i128_sextend_i32(0x7fff_ffff) == 0x00000000_00000000_00000000_7fffffff
+; run: %i128_sextend_i32(0xffff_eeee) == 0xffffffff_ffffffff_ffffffff_ffff_eeee
+
+
+function %i128_uextend_i16(i16) -> i128 {
+block0(v0: i16):
+    v1 = uextend.i128 v0
+    return v1
+}
+; run: %i128_uextend_i16(0) == 0
+; run: %i128_uextend_i16(-1) == 0x00000000_00000000_00000000_0000ffff
+; run: %i128_uextend_i16(0xffee) == 0x00000000_00000000_00000000_0000ffee
+
+function %i128_sextend_i16(i16) -> i128 {
+block0(v0: i16):
+    v1 = sextend.i128 v0
+    return v1
+}
+; run: %i128_sextend_i16(0) == 0
+; run: %i128_sextend_i16(-1) == -1
+; run: %i128_sextend_i16(0x7fff) == 0x00000000_00000000_00000000_00007fff
+; run: %i128_sextend_i16(0xffee) == 0xffffffff_ffffffff_ffffffff_ffffffee
+
+
+function %i128_uextend_i8(i8) -> i128 {
+block0(v0: i8):
+    v1 = uextend.i128 v0
+    return v1
+}
+; run: %i128_uextend_i8(0) == 0
+; run: %i128_uextend_i8(-1) == 0x00000000_00000000_00000000_000000ff
+; run: %i128_uextend_i8(0xfe) == 0x00000000_00000000_00000000_000000fe
+
+function %i128_sextend_i8(i8) -> i128 {
+block0(v0: i8):
+    v1 = sextend.i128 v0
+    return v1
+}
+; run: %i128_sextend_i8(0) == 0
+; run: %i128_sextend_i8(-1) == -1
+; run: %i128_sextend_i8(0x7f) == 0x00000000_00000000_00000000_0000007f
+; run: %i128_sextend_i8(0xfe) == 0xffffffff_ffffffff_ffffffff_fffffffe
diff --git a/cranelift/filetests/filetests/runtests/i128-icmp.clif b/cranelift/filetests/filetests/runtests/i128-icmp.clif
index 5758d5ef35..6fb3f1808b 100644
--- a/cranelift/filetests/filetests/runtests/i128-icmp.clif
+++ b/cranelift/filetests/filetests/runtests/i128-icmp.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %icmp_eq_i128(i128, i128) -> b1 {
 block0(v0: i128, v1: i128):
diff --git a/cranelift/filetests/filetests/runtests/i128-load-store.clif b/cranelift/filetests/filetests/runtests/i128-load-store.clif
index 4d4c9e11dd..dc389bc049 100644
--- a/cranelift/filetests/filetests/runtests/i128-load-store.clif
+++ b/cranelift/filetests/filetests/runtests/i128-load-store.clif
@@ -1,6 +1,6 @@
 test run
 set enable_llvm_abi_extensions=true
-target x86_64 machinst
+target x86_64
 target aarch64
 
 function %i128_stack_store_load(i128) -> b1 {
diff --git a/cranelift/filetests/filetests/runtests/i128-reduce.clif b/cranelift/filetests/filetests/runtests/i128-reduce.clif
index 15baef87f1..0554aafeda 100644
--- a/cranelift/filetests/filetests/runtests/i128-reduce.clif
+++ b/cranelift/filetests/filetests/runtests/i128-reduce.clif
@@ -1,7 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %ireduce_128_64(i128) -> i64 {
 block0(v0: i128):
diff --git a/cranelift/filetests/filetests/runtests/i128-rotate.clif b/cranelift/filetests/filetests/runtests/i128-rotate.clif
index 47a4ab9ea5..8e0b23d0a9 100644
--- a/cranelift/filetests/filetests/runtests/i128-rotate.clif
+++ b/cranelift/filetests/filetests/runtests/i128-rotate.clif
@@ -1,7 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %rotl(i128, i8) -> i128 {
 block0(v0: i128, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/i128-select.clif b/cranelift/filetests/filetests/runtests/i128-select.clif
index d557d31e2f..bf643a9e2c 100644
--- a/cranelift/filetests/filetests/runtests/i128-select.clif
+++ b/cranelift/filetests/filetests/runtests/i128-select.clif
@@ -1,7 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %i128_select(b1, i128, i128) -> i128 {
 block0(v0: b1, v1: i128, v2: i128):
diff --git a/cranelift/filetests/filetests/runtests/i128-shifts.clif b/cranelift/filetests/filetests/runtests/i128-shifts.clif
index 41cef85e16..7cd37995a5 100644
--- a/cranelift/filetests/filetests/runtests/i128-shifts.clif
+++ b/cranelift/filetests/filetests/runtests/i128-shifts.clif
@@ -1,7 +1,7 @@
 test run
 set enable_llvm_abi_extensions=true
 target aarch64
-target x86_64 machinst
+target x86_64
 
 
 function %ishl_i128_i128(i128, i8) -> i128 {
diff --git a/cranelift/filetests/filetests/runtests/icmp-eq.clif b/cranelift/filetests/filetests/runtests/icmp-eq.clif
index 4708e6da3e..ccd9c2ffe8 100644
--- a/cranelift/filetests/filetests/runtests/icmp-eq.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-eq.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %icmp_eq_i8(i8, i8) -> b1 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/icmp-ne.clif b/cranelift/filetests/filetests/runtests/icmp-ne.clif
index 79dd304ed4..6e841b876b 100644
--- a/cranelift/filetests/filetests/runtests/icmp-ne.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-ne.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %icmp_ne_i8(i8, i8) -> b1 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/icmp-nof.clif b/cranelift/filetests/filetests/runtests/icmp-nof.clif
index 1814fa1547..6817b01651 100644
--- a/cranelift/filetests/filetests/runtests/icmp-nof.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-nof.clif
@@ -1,6 +1,6 @@
 test interpret
 test run
-target x86_64 machinst
+target x86_64
 
 function %icmp_nof_i8(i8, i8) -> b1 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/icmp-of.clif b/cranelift/filetests/filetests/runtests/icmp-of.clif
index d45917ffd1..26565d4ce2 100644
--- a/cranelift/filetests/filetests/runtests/icmp-of.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-of.clif
@@ -1,6 +1,6 @@
 test interpret
 test run
-target x86_64 machinst
+target x86_64
 
 function %icmp_of_i8(i8, i8) -> b1 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/icmp-sge.clif b/cranelift/filetests/filetests/runtests/icmp-sge.clif
index ccdcf80215..98981981e7 100644
--- a/cranelift/filetests/filetests/runtests/icmp-sge.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-sge.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 
 function %icmp_sge_i8(i8, i8) -> b1 {
diff --git a/cranelift/filetests/filetests/runtests/icmp-sgt.clif b/cranelift/filetests/filetests/runtests/icmp-sgt.clif
index 9395ab6af1..c5f036b39f 100644
--- a/cranelift/filetests/filetests/runtests/icmp-sgt.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-sgt.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 
 function %icmp_sgt_i8(i8, i8) -> b1 {
diff --git a/cranelift/filetests/filetests/runtests/icmp-sle.clif b/cranelift/filetests/filetests/runtests/icmp-sle.clif
index 040f6a3b29..586c3a0c1b 100644
--- a/cranelift/filetests/filetests/runtests/icmp-sle.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-sle.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 
 function %icmp_sle_i8(i8, i8) -> b1 {
diff --git a/cranelift/filetests/filetests/runtests/icmp-slt.clif b/cranelift/filetests/filetests/runtests/icmp-slt.clif
index 826676b460..89b37904b0 100644
--- a/cranelift/filetests/filetests/runtests/icmp-slt.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-slt.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %icmp_slt_i8(i8, i8) -> b1 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/icmp-uge.clif b/cranelift/filetests/filetests/runtests/icmp-uge.clif
index bdc73e6e8e..8e6bda917f 100644
--- a/cranelift/filetests/filetests/runtests/icmp-uge.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-uge.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %icmp_uge_i8(i8, i8) -> b1 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/icmp-ugt.clif b/cranelift/filetests/filetests/runtests/icmp-ugt.clif
index 98d5634157..5e99ec4ff2 100644
--- a/cranelift/filetests/filetests/runtests/icmp-ugt.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-ugt.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %icmp_ugt_i8(i8, i8) -> b1 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/icmp-ule.clif b/cranelift/filetests/filetests/runtests/icmp-ule.clif
index d7d0a72a3a..38ce80a309 100644
--- a/cranelift/filetests/filetests/runtests/icmp-ule.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-ule.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %icmp_ule_i8(i8, i8) -> b1 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/icmp-ult.clif b/cranelift/filetests/filetests/runtests/icmp-ult.clif
index cd1e794deb..c0821afb87 100644
--- a/cranelift/filetests/filetests/runtests/icmp-ult.clif
+++ b/cranelift/filetests/filetests/runtests/icmp-ult.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %icmp_ult_i8(i8, i8) -> b1 {
 block0(v0: i8, v1: i8):
diff --git a/cranelift/filetests/filetests/runtests/icmp.clif b/cranelift/filetests/filetests/runtests/icmp.clif
index 5f13fdffec..e33d3728e5 100644
--- a/cranelift/filetests/filetests/runtests/icmp.clif
+++ b/cranelift/filetests/filetests/runtests/icmp.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 target s390x
-target x86_64 machinst
+target x86_64
 
 ; This test is also a regression test for aarch64.
 ; We were not correctly handling the fact that the rhs constant value
diff --git a/cranelift/filetests/filetests/runtests/shifts.clif b/cranelift/filetests/filetests/runtests/shifts.clif
index a7b27ca3ed..c39ff3a0d4 100644
--- a/cranelift/filetests/filetests/runtests/shifts.clif
+++ b/cranelift/filetests/filetests/runtests/shifts.clif
@@ -1,6 +1,6 @@
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 target s390x
 
 
diff --git a/cranelift/filetests/filetests/runtests/simd-arithmetic-nondeterministic-x86_64.clif b/cranelift/filetests/filetests/runtests/simd-arithmetic-nondeterministic-x86_64.clif
index 323579b6ce..caa49d9534 100644
--- a/cranelift/filetests/filetests/runtests/simd-arithmetic-nondeterministic-x86_64.clif
+++ b/cranelift/filetests/filetests/runtests/simd-arithmetic-nondeterministic-x86_64.clif
@@ -3,7 +3,7 @@
 ; simd-arithmetic-nondeterministic*.clif as well.
 test run
 set enable_simd
-target x86_64 machinst skylake
+target x86_64 skylake
 
 function %fmax_f64x2(f64x2, f64x2) -> f64x2 {
 block0(v0: f64x2, v1: f64x2):
diff --git a/cranelift/filetests/filetests/runtests/simd-arithmetic.clif b/cranelift/filetests/filetests/runtests/simd-arithmetic.clif
index 5397f5d874..1ca8e8fcfa 100644
--- a/cranelift/filetests/filetests/runtests/simd-arithmetic.clif
+++ b/cranelift/filetests/filetests/runtests/simd-arithmetic.clif
@@ -2,9 +2,7 @@ test run
 target aarch64
 ; target s390x TODO: Not yet implemented on s390x
 set enable_simd
-target x86_64 machinst skylake
-set enable_simd
-target x86_64 legacy skylake
+target x86_64 skylake
 
 function %iadd_i32x4(i32x4, i32x4) -> i32x4 {
 block0(v0:i32x4, v1:i32x4):
diff --git a/cranelift/filetests/filetests/runtests/simd-bitselect-to-vselect.clif b/cranelift/filetests/filetests/runtests/simd-bitselect-to-vselect.clif
index ae23e1552c..a2086b0426 100644
--- a/cranelift/filetests/filetests/runtests/simd-bitselect-to-vselect.clif
+++ b/cranelift/filetests/filetests/runtests/simd-bitselect-to-vselect.clif
@@ -3,12 +3,7 @@ target aarch64
 ; target s390x TODO: Not yet implemented on s390x
 set opt_level=speed_and_size
 set enable_simd
-target x86_64 machinst skylake
-set opt_level=speed_and_size
-set enable_simd
-target x86_64 legacy haswell
-
-;; x86_64 legacy: Test if bitselect->vselect optimization works properly
+target x86_64 skylake
 
 function %mask_from_icmp(i32x4, i32x4) -> i32x4 {
 block0(v0: i32x4, v1: i32x4):
diff --git a/cranelift/filetests/filetests/runtests/simd-bitwise-run.clif b/cranelift/filetests/filetests/runtests/simd-bitwise-run.clif
index 4f66e51ec4..af7b24d5e6 100644
--- a/cranelift/filetests/filetests/runtests/simd-bitwise-run.clif
+++ b/cranelift/filetests/filetests/runtests/simd-bitwise-run.clif
@@ -1,7 +1,7 @@
 test run
 set enable_simd
 target aarch64
-target x86_64 legacy skylake
+target x86_64 skylake
 
 ; TODO: once available, replace all lane extraction with `icmp + all_ones`
 
diff --git a/cranelift/filetests/filetests/runtests/simd-bitwise.clif b/cranelift/filetests/filetests/runtests/simd-bitwise.clif
index 44474b5b80..670844db22 100644
--- a/cranelift/filetests/filetests/runtests/simd-bitwise.clif
+++ b/cranelift/filetests/filetests/runtests/simd-bitwise.clif
@@ -2,7 +2,7 @@ test run
 target aarch64
 ; target s390x TODO: Not yet implemented on s390x
 set enable_simd
-target x86_64 machinst skylake
+target x86_64 skylake
 
 function %bitselect_i8x16(i8x16, i8x16, i8x16) -> i8x16 {
 block0(v0: i8x16, v1: i8x16, v2: i8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-comparison-legacy.clif b/cranelift/filetests/filetests/runtests/simd-comparison-legacy.clif
deleted file mode 100644
index 4ed7ae8224..0000000000
--- a/cranelift/filetests/filetests/runtests/simd-comparison-legacy.clif
+++ /dev/null
@@ -1,44 +0,0 @@
-test run
-set enable_simd
-target x86_64 legacy
-
-function %maxs_i8x16() -> b1 {
-block0:
-    v0 = vconst.i8x16 [1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1] ; 1 will be greater than -1 == 0xff with
-    ; signed max
-    v1 = vconst.i8x16 [0xff 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1]
-    v2 = x86_pmaxs v0, v1
-    v8 = vall_true v2
-    return v8
-}
-; run
-
-function %maxu_i16x8() -> b1 {
-block0:
-    v0 = vconst.i16x8 [0 1 1 1 1 1 1 1]
-    v1 = vconst.i16x8 [-1 1 1 1 1 1 1 1] ; -1 == 0xff will be greater with unsigned max
-    v2 = x86_pmaxu v0, v1
-    v8 = vall_true v2
-    return v8
-}
-; run
-
-function %mins_i32x4() -> b1 {
-block0:
-    v0 = vconst.i32x4 [0 1 1 1]
-    v1 = vconst.i32x4 [-1 1 1 1] ; -1 == 0xff will be less with signed min
-    v2 = x86_pmins v0, v1
-    v8 = vall_true v2
-    return v8
-}
-; run
-
-function %minu_i8x16() -> b1 {
-block0:
-    v0 = vconst.i8x16 [1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1] ; 1 < 2 with unsiged min
-    v1 = vconst.i8x16 [2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2]
-    v2 = x86_pminu v0, v1
-    v8 = vall_true v2
-    return v8
-}
-; run
diff --git a/cranelift/filetests/filetests/runtests/simd-comparison.clif b/cranelift/filetests/filetests/runtests/simd-comparison.clif
index 33402b1175..c704e5a3b5 100644
--- a/cranelift/filetests/filetests/runtests/simd-comparison.clif
+++ b/cranelift/filetests/filetests/runtests/simd-comparison.clif
@@ -2,9 +2,7 @@ test run
 target aarch64
 ; target s390x TODO: Not yet implemented on s390x
 set enable_simd
-target x86_64 machinst
-set enable_simd
-target x86_64 legacy
+target x86_64
 
 function %icmp_eq_i8x16() -> b8 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/simd-conversion.clif b/cranelift/filetests/filetests/runtests/simd-conversion.clif
index 4f984b8c48..b950a9a2cd 100644
--- a/cranelift/filetests/filetests/runtests/simd-conversion.clif
+++ b/cranelift/filetests/filetests/runtests/simd-conversion.clif
@@ -2,9 +2,7 @@ test run
 target aarch64
 ; target s390x TODO: Not yet implemented on s390x
 set enable_simd
-target x86_64 machinst
-set enable_simd
-target x86_64 legacy
+target x86_64
 
 function %fcvt_from_sint(i32x4) -> f32x4 {
 block0(v0: i32x4):
diff --git a/cranelift/filetests/filetests/runtests/simd-iabs.clif b/cranelift/filetests/filetests/runtests/simd-iabs.clif
index 022815c4a4..ee1db6762c 100644
--- a/cranelift/filetests/filetests/runtests/simd-iabs.clif
+++ b/cranelift/filetests/filetests/runtests/simd-iabs.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %iabs_i8x16(i8x16) -> i8x16 {
 block0(v0: i8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-lane-access-legacy.clif b/cranelift/filetests/filetests/runtests/simd-lane-access-legacy.clif
deleted file mode 100644
index 3318635035..0000000000
--- a/cranelift/filetests/filetests/runtests/simd-lane-access-legacy.clif
+++ /dev/null
@@ -1,221 +0,0 @@
-test run
-set enable_simd
-target x86_64 legacy
-
-function %shuffle_different_ssa_values() -> b1 {
-block0:
-    v0 = vconst.i8x16 0x00
-    v1 = vconst.i8x16 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 42]
-    v2 = shuffle v0, v1, [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 31]     ; use the first lane of v0 throughout except use the last lane of v1
-    v3 = extractlane.i8x16 v2, 15
-    v4 = iconst.i8 42
-    v5 = icmp eq v3, v4
-    return v5
-}
-; run
-
-function %shuffle_same_ssa_value() -> b1 {
-block0:
-    v0 = vconst.i8x16 0x01000000_00000000_00000000_00000000     ; note where lane 15 is when written with hexadecimal syntax
-    v1 = shuffle v0, v0, 0x0f0f0f0f_0f0f0f0f_0f0f0f0f_0f0f0f0f  ; use the last lane of v0 to fill all lanes
-    v2 = extractlane.i8x16 v1, 4
-    v3 = iconst.i8 0x01
-    v4 = icmp eq v2, v3
-    return v4
-}
-; run
-
-function %compare_shuffle() -> b1 {
-block0:
-    v1 = vconst.i32x4 [0 1 2 3]
-    v2 = raw_bitcast.i8x16  v1 ; we have to cast because shuffle is type-limited to Tx16
-    ; keep each lane in place from the first vector
-    v3 = shuffle v2, v2, [0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15]
-    v4 = raw_bitcast.i32x4 v3
-    v5 = extractlane.i32x4 v4, 3
-    v6 = icmp_imm eq v5, 3
-    v7 = extractlane.i32x4 v4, 0
-    v8 = icmp_imm eq v7, 0
-    v9 = band v6, v8
-    return v9
-}
-; run
-
-function %compare_shuffle() -> b32 {
-block0:
-    v1 = vconst.b32x4 [true false true false]
-    v2 = raw_bitcast.b8x16 v1 ; we have to cast because shuffle is type-limited to Tx16
-    ; pair up the true values to make the entire vector true
-    v3 = shuffle v2, v2, [0 1 2 3 0 1 2 3 8 9 10 11 8 9 10 11]
-    v4 = raw_bitcast.b32x4 v3
-    v5 = extractlane v4, 3
-    v6 = extractlane v4, 0
-    v7 = band v5, v6
-    return v7
-}
-; run
-
-; TODO once SIMD vector comparison is implemented, remove use of extractlane below
-
-function %insertlane_b8() -> b8 {
-block0:
-    v1 = bconst.b8 true
-    v2 = vconst.b8x16 [false false false false false false false false false false false false false
-     false false false]
-    v3 = insertlane v2, v1, 10
-    v4 = extractlane v3, 10
-    return v4
-}
-; run
-
-function %insertlane_f32() -> b1 {
-block0:
-    v0 = f32const 0x42.42
-    v1 = vconst.f32x4 0x00
-    v2 = insertlane v1, v0, 1
-    v3 = extractlane v2, 1
-    v4 = fcmp eq v3, v0
-    return v4
-}
-; run
-
-function %insertlane_f64_lane1() -> b1 {
-block0:
-    v0 = f64const 0x42.42
-    v1 = vconst.f64x2 0x00
-    v2 = insertlane v1, v0, 1
-    v3 = extractlane v2, 1
-    v4 = fcmp eq v3, v0
-    return v4
-}
-; run
-
-function %insertlane_f64_lane0() -> b1 {
-block0:
-    v0 = f64const 0x42.42
-    v1 = vconst.f64x2 0x00
-    v2 = insertlane v1, v0, 0
-    v3 = extractlane v2, 0
-    v4 = fcmp eq v3, v0
-    return v4
-}
-; run
-
-function %extractlane_b8() -> b8 {
-block0:
-    v1 = vconst.b8x16 [false false false false false false false false false false true false false
-    false false false]
-    v2 = extractlane v1, 10
-    return v2
-}
-; run
-
-function %extractlane_i16() -> b1 {
-block0:
-    v0 = vconst.i16x8 0x00080007000600050004000300020001
-    v1 = extractlane v0, 1
-    v2 = icmp_imm eq v1, 2
-    return v2
-}
-; run
-
-function %extractlane_f32() -> b1 {
-block0:
-    v0 = f32const 0x42.42
-    v1 = vconst.f32x4 [0x00.00 0x00.00 0x00.00 0x42.42]
-    v2 = extractlane v1, 3
-    v3 = fcmp eq v2, v0
-    return v3
-}
-; run
-
-function %extractlane_i32_with_vector_reuse() -> b1 {
-block0:
-    v0 = iconst.i32 42
-    v1 = iconst.i32 99
-
-    v2 = splat.i32x4 v0
-    v3 = insertlane v2, v1, 2
-
-    v4 = extractlane v3, 3
-    v5 = icmp eq v4, v0
-
-    v6 = extractlane v3, 2
-    v7 = icmp eq v6, v1
-
-    v8 = band v5, v7
-    return v8
-}
-; run
-
-function %extractlane_f32_with_vector_reuse() -> b1 {
-block0:
-    v0 = f32const 0x42.42
-    v1 = f32const 0x99.99
-
-    v2 = splat.f32x4 v0
-    v3 = insertlane v2, v1, 2
-
-    v4 = extractlane v3, 3
-    v5 = fcmp eq v4, v0
-
-    v6 = extractlane v3, 2
-    v7 = fcmp eq v6, v1
-
-    v8 = band v5, v7
-    return v8
-}
-; run
-
-function %swizzle() -> b1 {
-block0:
-    v0 = vconst.i8x16 [0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15]
-    v1 = vconst.i8x16 [15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 42]
-    v2 = swizzle.i8x16 v0, v1 ; reverse the lanes, with over-large index 42 using lane 0
-
-    v3 = vconst.i8x16 [15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0]
-    v4 = icmp eq v2, v3
-    v5 = vall_true v4
-    return v5
-}
-; run
-
-function %swizzle_with_overflow() -> b1 {
-block0:
-    v0 = vconst.i8x16 [0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15]
-    v1 = vconst.i8x16 [16 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0]
-    v2 = swizzle.i8x16 v0, v1 ; 250 should overflow but saturate so that the MSB is set (PSHUFB uses this to shuffle from lane 0)
-
-    v3 = vconst.i8x16 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0]
-    v4 = icmp eq v2, v3
-    v5 = vall_true v4
-    return v5
-}
-; run
-
-function %unpack_low() -> b1 {
-block0:
-    v0 = vconst.i32x4 [0 1 2 3]
-    v1 = vconst.i32x4 [4 5 6 7]
-    v2 = x86_punpckl v0, v1
-
-    v3 = vconst.i32x4 [0 4 1 5]
-    v4 = icmp eq v2, v3
-    v5 = vall_true v4
-    return v5
-}
-; run
-
-function %snarrow(i32x4, i32x4) -> i16x8 {
-block0(v0: i32x4, v1: i32x4):
-    v2 = snarrow v0, v1
-    return v2
-}
-; run: %snarrow([0 1 -1 0x0001ffff], [4 5 -6 0xffffffff]) == [0 1 -1 0x7fff 4 5 -6 0xffff]
-
-function %unarrow(i32x4, i32x4) -> i16x8 {
-block0(v0: i32x4, v1: i32x4):
-    v2 = unarrow v0, v1
-    return v2
-}
-; run: %unarrow([0 1 -1 0x0001ffff], [4 5 -6 0xffffffff]) == [0 1 0 0xffff 4 5 0 0]
diff --git a/cranelift/filetests/filetests/runtests/simd-lane-access.clif b/cranelift/filetests/filetests/runtests/simd-lane-access.clif
index 4ab67d9177..7510cd8865 100644
--- a/cranelift/filetests/filetests/runtests/simd-lane-access.clif
+++ b/cranelift/filetests/filetests/runtests/simd-lane-access.clif
@@ -2,7 +2,7 @@ test run
 target aarch64
 ; target s390x TODO: Not yet implemented on s390x
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 ;; shuffle
 
diff --git a/cranelift/filetests/filetests/runtests/simd-logical.clif b/cranelift/filetests/filetests/runtests/simd-logical.clif
index 6480dd98f7..9cdf8fdb69 100644
--- a/cranelift/filetests/filetests/runtests/simd-logical.clif
+++ b/cranelift/filetests/filetests/runtests/simd-logical.clif
@@ -2,7 +2,7 @@ test run
 target aarch64
 ; target s390x TODO: Not yet implemented on s390x
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %bnot() -> b32 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/simd-sqmulroundsat.clif b/cranelift/filetests/filetests/runtests/simd-sqmulroundsat.clif
index a6ada04f22..1faa3592ad 100644
--- a/cranelift/filetests/filetests/runtests/simd-sqmulroundsat.clif
+++ b/cranelift/filetests/filetests/runtests/simd-sqmulroundsat.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %sqmulrs_i16x8(i16x8, i16x8) -> i16x8 {
 block0(v0: i16x8, v1: i16x8):
diff --git a/cranelift/filetests/filetests/runtests/simd-swidenhigh.clif b/cranelift/filetests/filetests/runtests/simd-swidenhigh.clif
index 6242859e8d..47d4229c61 100644
--- a/cranelift/filetests/filetests/runtests/simd-swidenhigh.clif
+++ b/cranelift/filetests/filetests/runtests/simd-swidenhigh.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %swidenhigh_i8x16(i8x16) -> i16x8 {
 block0(v0: i8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-swidenlow.clif b/cranelift/filetests/filetests/runtests/simd-swidenlow.clif
index 38f100ef29..997734702b 100644
--- a/cranelift/filetests/filetests/runtests/simd-swidenlow.clif
+++ b/cranelift/filetests/filetests/runtests/simd-swidenlow.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %swidenlow_i8x16(i8x16) -> i16x8 {
 block0(v0: i8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-swizzle.clif b/cranelift/filetests/filetests/runtests/simd-swizzle.clif
index 6cad36f033..6375e0b0e8 100644
--- a/cranelift/filetests/filetests/runtests/simd-swizzle.clif
+++ b/cranelift/filetests/filetests/runtests/simd-swizzle.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %swizzle_i8x16(i8x16, i8x16) -> i8x16 {
 block0(v0: i8x16, v1: i8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-uwidenhigh.clif b/cranelift/filetests/filetests/runtests/simd-uwidenhigh.clif
index 281e63ac02..d9e4b2b0e0 100644
--- a/cranelift/filetests/filetests/runtests/simd-uwidenhigh.clif
+++ b/cranelift/filetests/filetests/runtests/simd-uwidenhigh.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %uwidenhigh_i8x16(i8x16) -> i16x8 {
 block0(v0: i8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-uwidenlow.clif b/cranelift/filetests/filetests/runtests/simd-uwidenlow.clif
index 8b865a305b..6acf4e1a2b 100644
--- a/cranelift/filetests/filetests/runtests/simd-uwidenlow.clif
+++ b/cranelift/filetests/filetests/runtests/simd-uwidenlow.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %uwidenlow_i8x16(i8x16) -> i16x8 {
 block0(v0: i8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-valltrue.clif b/cranelift/filetests/filetests/runtests/simd-valltrue.clif
index ced9a6bb0d..c39a2702e6 100644
--- a/cranelift/filetests/filetests/runtests/simd-valltrue.clif
+++ b/cranelift/filetests/filetests/runtests/simd-valltrue.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %vall_true_b8x16(b8x16) -> b1 {
 block0(v0: b8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-vanytrue.clif b/cranelift/filetests/filetests/runtests/simd-vanytrue.clif
index cf407ea606..74b99d785e 100644
--- a/cranelift/filetests/filetests/runtests/simd-vanytrue.clif
+++ b/cranelift/filetests/filetests/runtests/simd-vanytrue.clif
@@ -1,7 +1,7 @@
 test interpret
 test run
 target aarch64
-target x86_64 machinst
+target x86_64
 
 function %vany_true_b8x16(b8x16) -> b1 {
 block0(v0: b8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-vconst-optimized-legacy.clif b/cranelift/filetests/filetests/runtests/simd-vconst-optimized-legacy.clif
deleted file mode 100644
index 8d28c6b0de..0000000000
--- a/cranelift/filetests/filetests/runtests/simd-vconst-optimized-legacy.clif
+++ /dev/null
@@ -1,46 +0,0 @@
-test run
-set enable_simd
-target x86_64 legacy
-
-function %vconst_syntax() -> b1 {
-block0:
-    v0 = vconst.i32x4 0x00000004_00000003_00000002_00000001     ; build constant using hexadecimal syntax
-    v1 = vconst.i32x4 [1 2 3 4]                                 ; build constant using literal list syntax
-
-    ; verify lane 1 matches
-    v2 = extractlane v0, 1
-    v3 = extractlane v1, 1
-    v4 = icmp eq v3, v2
-
-    ; verify lane 1 has the correct value
-    v5 = icmp_imm eq v3, 2
-
-    v6 = band v4, v5
-    return v6
-}
-; run
-
-; Since both jump tables and constants are emitted after the function body, it is important that any RIP-relative
-; addressing of constants is not incorrect in the presence of jump tables. This test confirms that, even when both
-; jump tables and constants are emitted, the constant addressing works correctly.
-function %vconst_with_jumptables() -> b1 {
-jt0 = jump_table [block0]
-
-block10:
-    v10 = iconst.i64 0
-    br_table v10, block1, jt0
-block0:
-    v0 = iconst.i64 100
-    jump block11(v0)
-block1:
-    v1 = iconst.i64 101
-    jump block11(v1)
-block11(v11: i64):
-    v12 = icmp_imm eq v11, 100        ; We should have jumped through block 0.
-    v13 = vconst.i32x4 [1 2 3 4]
-    v14 = extractlane.i32x4 v13, 1 ; Extract the second element...
-    v15 = icmp_imm eq v14, 2       ; ...which should be the value 2.
-    v16 = band v12, v15
-    return v16
-}
-; run
diff --git a/cranelift/filetests/filetests/runtests/simd-vconst.clif b/cranelift/filetests/filetests/runtests/simd-vconst.clif
index 49b89a0330..f1a98e7ea1 100644
--- a/cranelift/filetests/filetests/runtests/simd-vconst.clif
+++ b/cranelift/filetests/filetests/runtests/simd-vconst.clif
@@ -2,11 +2,7 @@ test run
 ; target s390x TODO: Not yet implemented on s390x
 target aarch64
 set enable_simd
-target x86_64 machinst
-set enable_simd
-target x86_64 legacy
-set enable_simd
-target x86_64 legacy skylake
+target x86_64
 
 
 function %vconst_zeroes() -> b1 {
diff --git a/cranelift/filetests/filetests/runtests/simd-vhighbits.clif b/cranelift/filetests/filetests/runtests/simd-vhighbits.clif
index a5d7146f11..2a9c5d1a75 100644
--- a/cranelift/filetests/filetests/runtests/simd-vhighbits.clif
+++ b/cranelift/filetests/filetests/runtests/simd-vhighbits.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %vhighbits_i8x16(i8x16) -> i16 {
 block0(v0: i8x16):
diff --git a/cranelift/filetests/filetests/runtests/simd-vselect.clif b/cranelift/filetests/filetests/runtests/simd-vselect.clif
index 5c910df60d..84a2479ca5 100644
--- a/cranelift/filetests/filetests/runtests/simd-vselect.clif
+++ b/cranelift/filetests/filetests/runtests/simd-vselect.clif
@@ -3,7 +3,7 @@ test run
 ; target s390x TODO: Not yet implemented on s390x
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %vselect_i8x16() -> i8x16 {
 block0:
diff --git a/cranelift/filetests/filetests/runtests/smulhi.clif b/cranelift/filetests/filetests/runtests/smulhi.clif
index b2fe1072ed..ec855002a4 100644
--- a/cranelift/filetests/filetests/runtests/smulhi.clif
+++ b/cranelift/filetests/filetests/runtests/smulhi.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %smulhi_i16(i16, i16) -> i16 {
 block0(v0: i16, v1: i16):
diff --git a/cranelift/filetests/filetests/runtests/spill-reload.clif b/cranelift/filetests/filetests/runtests/spill-reload.clif
index 63f8c50576..f2c6bd0fe6 100644
--- a/cranelift/filetests/filetests/runtests/spill-reload.clif
+++ b/cranelift/filetests/filetests/runtests/spill-reload.clif
@@ -1,8 +1,7 @@
 test run
 target s390x
 target aarch64
-target x86_64 machinst
-target x86_64 legacy
+target x86_64
 
 function %f(i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32) -> i64 {
 block0(v0: i32, v1: i32, v2: i32, v3: i32, v4: i32, v5: i32, v6: i32, v7: i32, v8: i32, v9: i32, v10: i32, v11: i32, v12: i32, v13: i32, v14: i32, v15: i32, v16: i32, v17: i32, v18: i32, v19: i32):
diff --git a/cranelift/filetests/filetests/runtests/stack-addr-64.clif b/cranelift/filetests/filetests/runtests/stack-addr-64.clif
index 0e59e7c410..5dd4527024 100644
--- a/cranelift/filetests/filetests/runtests/stack-addr-64.clif
+++ b/cranelift/filetests/filetests/runtests/stack-addr-64.clif
@@ -1,6 +1,6 @@
 test interpret
 test run
-target x86_64 machinst
+target x86_64
 target s390x
 target aarch64
 
diff --git a/cranelift/filetests/filetests/runtests/stack.clif b/cranelift/filetests/filetests/runtests/stack.clif
index 0a7323c4d9..efcc25f02e 100644
--- a/cranelift/filetests/filetests/runtests/stack.clif
+++ b/cranelift/filetests/filetests/runtests/stack.clif
@@ -1,6 +1,6 @@
 test interpret
 test run
-target x86_64 machinst
+target x86_64
 target s390x
 target aarch64
 
diff --git a/cranelift/filetests/filetests/runtests/umulhi.clif b/cranelift/filetests/filetests/runtests/umulhi.clif
index bb6b06bedd..fd643151ab 100644
--- a/cranelift/filetests/filetests/runtests/umulhi.clif
+++ b/cranelift/filetests/filetests/runtests/umulhi.clif
@@ -2,7 +2,7 @@ test interpret
 test run
 target aarch64
 set enable_simd
-target x86_64 machinst
+target x86_64
 
 function %umulhi_i16(i16, i16) -> i16 {
 block0(v0: i16, v1: i16):