Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

winch(aarch64): clean up v128 wast expectations (#13969)

Daniel Macovei02138a3c7ba7
diff --git a/crates/test-util/src/wast.rs b/crates/test-util/src/wast.rs
index 8e172eb577..59ea1db48f 100644
--- a/crates/test-util/src/wast.rs
+++ b/crates/test-util/src/wast.rs
@@ -506,47 +506,6 @@ impl WastTest {
}
}
- if config.compiler == Compiler::Winch && cfg!(target_arch = "aarch64") {
- let now_supported = [
- "misc_testsuite/winch/v128_load_lane_invalid_address.wast",
- "misc_testsuite/simd/issue4807.wast",
- "misc_testsuite/simd/replace-lane-preserve.wast",
- "misc_testsuite/simd/spillslot-size-fuzzbug.wast",
- "misc_testsuite/simd/interesting-float-splat.wast",
- "misc_testsuite/simd/issue_3173_select_v128.wast",
- "misc_testsuite/simd/v128-select.wast",
- "misc_testsuite/winch/issue-10460.wast",
- "misc_testsuite/winch/issue-10357.wast",
- "misc_testsuite/winch/simd_multivalue.wast",
- "misc_testsuite/simd/unaligned-load.wast",
- "misc_testsuite/simd/riscv64-replicated-imm5-works.wast",
- "misc_testsuite/simd/issue6725-no-egraph-panic.wast",
- "misc_testsuite/winch/replace_lane.wast",
- "misc_testsuite/simd/v128-equal.wast",
- "misc_testsuite/winch/issue-10331.wast",
- "misc_testsuite/int-to-float-splat.wast",
- "misc_testsuite/simd/cvt-from-uint.wast",
- "misc_testsuite/memory64/simd.wast",
- "misc_testsuite/simd/load_splat_out_of_bounds.wast",
- "misc_testsuite/simd/edge-of-memory.wast",
- "misc_testsuite/issue6562.wast",
- "misc_testsuite/simd/almost-extmul.wast",
- "misc_testsuite/simd/sse-cannot-fold-unaligned-loads.wast",
- "misc_testsuite/simd/issue_3327_bnot_lowering.wast",
- "misc_testsuite/simd/canonicalize-nan.wast",
- ];
- if now_supported.iter().any(|part| self.path.ends_with(part)) {
- return false;
- }
-
- // SIMD support on winch aarch64 is still incomplete
- // (bytecodealliance/wasmtime#9925); non-spec simd tests are
- // expected to fail unless listed in `now_supported` above.
- if self.config.simd() && !self.config.spec_test() {
- return true;
- }
- }
-
if config.compiler.should_fail(&self.config) {
return true;
}
@@ -574,106 +533,6 @@ impl WastTest {
return true;
}
- #[cfg(target_arch = "aarch64")]
- {
- let unsupported = [
- "misc_testsuite/int-to-float-splat.wast",
- "misc_testsuite/issue6562.wast",
- "misc_testsuite/memory64/simd.wast",
- "misc_testsuite/simd/almost-extmul.wast",
- "misc_testsuite/simd/canonicalize-nan.wast",
- "misc_testsuite/simd/cvt-from-uint.wast",
- "misc_testsuite/simd/edge-of-memory.wast",
- "misc_testsuite/simd/interesting-float-splat.wast",
- "misc_testsuite/simd/issue6725-no-egraph-panic.wast",
- "misc_testsuite/simd/issue_3173_select_v128.wast",
- "misc_testsuite/simd/issue_3327_bnot_lowering.wast",
- "misc_testsuite/simd/load_splat_out_of_bounds.wast",
- "misc_testsuite/simd/replace-lane-preserve.wast",
- "misc_testsuite/simd/spillslot-size-fuzzbug.wast",
- "misc_testsuite/simd/sse-cannot-fold-unaligned-loads.wast",
- "misc_testsuite/simd/unaligned-load.wast",
- "misc_testsuite/simd/riscv64-replicated-imm5-works.wast",
- "misc_testsuite/simd/issue6725-no-egraph-panic.wast",
- "misc_testsuite/winch/replace_lane.wast",
- "misc_testsuite/simd/v128-equal.wast",
- "misc_testsuite/winch/issue-10331.wast",
- "misc_testsuite/int-to-float-splat.wast",
- "misc_testsuite/simd/cvt-from-uint.wast",
- "misc_testsuite/simd/v128-select.wast",
- "misc_testsuite/winch/issue-10331.wast",
- "misc_testsuite/int-to-float-splat.wast",
- "misc_testsuite/simd/cvt-from-uint.wast",
- "misc_testsuite/winch/issue-10357.wast",
- "misc_testsuite/winch/issue-10460.wast",
- "misc_testsuite/winch/replace_lane.wast",
- "misc_testsuite/winch/simd_multivalue.wast",
- "spec_testsuite/proposals/annotations/simd_lane.wast",
- "spec_testsuite/proposals/multi-memory/simd_memory-multi.wast",
- "spec_testsuite/simd_address.wast",
- "spec_testsuite/simd_align.wast",
- "spec_testsuite/simd_bit_shift.wast",
- "spec_testsuite/simd_bitwise.wast",
- "spec_testsuite/simd_boolean.wast",
- "spec_testsuite/simd_const.wast",
- "spec_testsuite/simd_conversions.wast",
- "spec_testsuite/simd_f32x4.wast",
- "spec_testsuite/simd_f32x4_arith.wast",
- "spec_testsuite/simd_f32x4_cmp.wast",
- "spec_testsuite/simd_f32x4_pmin_pmax.wast",
- "spec_testsuite/simd_f32x4_rounding.wast",
- "spec_testsuite/simd_f64x2.wast",
- "spec_testsuite/simd_f64x2_arith.wast",
- "spec_testsuite/simd_f64x2_cmp.wast",
- "spec_testsuite/simd_f64x2_pmin_pmax.wast",
- "spec_testsuite/simd_f64x2_rounding.wast",
- "spec_testsuite/simd_i16x8_arith.wast",
- "spec_testsuite/simd_i16x8_arith2.wast",
- "spec_testsuite/simd_i16x8_cmp.wast",
- "spec_testsuite/simd_i16x8_extadd_pairwise_i8x16.wast",
- "spec_testsuite/simd_i16x8_extmul_i8x16.wast",
- "spec_testsuite/simd_i16x8_q15mulr_sat_s.wast",
- "spec_testsuite/simd_i16x8_sat_arith.wast",
- "spec_testsuite/simd_i32x4_arith.wast",
- "spec_testsuite/simd_i32x4_arith2.wast",
- "spec_testsuite/simd_i32x4_cmp.wast",
- "spec_testsuite/simd_i32x4_dot_i16x8.wast",
- "spec_testsuite/simd_i32x4_extadd_pairwise_i16x8.wast",
- "spec_testsuite/simd_i32x4_extmul_i16x8.wast",
- "spec_testsuite/simd_i32x4_trunc_sat_f32x4.wast",
- "spec_testsuite/simd_i32x4_trunc_sat_f64x2.wast",
- "spec_testsuite/simd_i64x2_arith.wast",
- "spec_testsuite/simd_i64x2_arith2.wast",
- "spec_testsuite/simd_i64x2_cmp.wast",
- "spec_testsuite/simd_i64x2_extmul_i32x4.wast",
- "spec_testsuite/simd_i8x16_arith.wast",
- "spec_testsuite/simd_i8x16_arith2.wast",
- "spec_testsuite/simd_i8x16_cmp.wast",
- "spec_testsuite/simd_i8x16_sat_arith.wast",
- "spec_testsuite/simd_int_to_int_extend.wast",
- "spec_testsuite/simd_lane.wast",
- "spec_testsuite/simd_load.wast",
- "spec_testsuite/simd_load16_lane.wast",
- "spec_testsuite/simd_load32_lane.wast",
- "spec_testsuite/simd_load64_lane.wast",
- "spec_testsuite/simd_load8_lane.wast",
- "spec_testsuite/simd_load_extend.wast",
- "spec_testsuite/simd_load_splat.wast",
- "spec_testsuite/simd_load_zero.wast",
- "spec_testsuite/simd_select.wast",
- "spec_testsuite/simd_splat.wast",
- "spec_testsuite/simd_store.wast",
- "spec_testsuite/simd_store16_lane.wast",
- "spec_testsuite/simd_store32_lane.wast",
- "spec_testsuite/simd_store64_lane.wast",
- "spec_testsuite/simd_store8_lane.wast",
- ];
-
- if unsupported.iter().any(|part| self.path.ends_with(part)) {
- return true;
- }
- }
-
#[cfg(target_arch = "x86_64")]
{
// SIMD on Winch requires AVX instructions.