Skip to content

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

Refactor Winch default features slightly (#14502)

Alex Crichton76713b99f684
diff --git a/crates/wasmtime/src/config.rs b/crates/wasmtime/src/config.rs
index 45657093e5..14d4d2ae0e 100644
--- a/crates/wasmtime/src/config.rs
+++ b/crates/wasmtime/src/config.rs
@@ -2480,11 +2480,9 @@ impl Config {
| WasmFeatures::CM_CANON_NAMES
| WasmFeatures::CM_ACCESSORS;
- #[allow(unused_mut, reason = "easier to avoid #[cfg]")]
let mut unsupported = !features_known_to_wasmtime;
- #[cfg(any(feature = "cranelift", feature = "winch"))]
- match self.compiler_config.as_ref().and_then(|c| c.strategy) {
+ match self.get_strategy() {
None | Some(Strategy::Cranelift) => {
// Pulley at this time fundamentally doesn't support the
// `threads` proposal, notably shared memory, because Rust can't
@@ -2538,6 +2536,13 @@ impl Config {
unsupported
}
+ fn get_strategy(&self) -> Option<Strategy> {
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ return self.compiler_config.as_ref()?.strategy;
+ #[cfg(not(any(feature = "cranelift", feature = "winch")))]
+ return None;
+ }
+
/// Calculates the set of features that are enabled for this `Config`.
///
/// This is a bit of a subtle function which takes into account inputs such
@@ -2561,43 +2566,63 @@ impl Config {
/// what's going on, and users should in theory be able to understand "ok
/// yeah that's why I can't enable that feature here".
fn features(&self) -> WasmFeatures {
- // Start with an empty set of wasm features. This notably decouples
- // features in Wasmtime from features in wasmparser as the two are
- // generally on different timelines.
- let mut features = WasmFeatures::empty();
+ let mut features;
// Next add in all on-by-default features that Wasmtime has which are
// subject to the criteria at
// https://docs.wasmtime.dev/contributing-implementing-wasm-proposals.html
// and https://docs.wasmtime.dev/stability-wasm-proposals.html.
//
- // Note that the first entry here, `WASM3`, is a fixed feature set that
- // won't change over time in wasmparser which represents the union of
- // all on-by-default features in Wasmtime. Also note that this is
- // further refined in the conditional section below based on crate
- // features.
- features |= WasmFeatures::WASM3;
-
- features |= WasmFeatures::WIDE_ARITHMETIC;
- // features |= WasmFeatures::YOUR_WASM_FEATURE;
- // ...
-
- // NB: if you add a feature above this line please double-check
+ // Features here are based on the currently selected compiler. Wasm
+ // features generally are tightly intertwined with compiler support, and
+ // just because we want to on-by-default support in one compiler doesn't
+ // mean we want it for another. Additionally note that each compiler
+ // here starts with a fixed, unchanging, set of wasm features (e.g.
+ // `WASM2` or `WASM3`) which insulates this from `wasmparser`'s
+ // defaults.
+ //
+ // Finally, `None` is possible here when compiler support isn't enabled
+ // at all. In that situation just assume we're using Cranelift's feature
+ // set.
+ //
+ // NB: if you add a feature to a compiler please double-check
// https://docs.wasmtime.dev/stability-wasm-proposals.html
// to ensure all requirements are met and/or update the documentation
// there too.
+ match self.get_strategy() {
+ None | Some(Strategy::Cranelift) => {
+ features = WasmFeatures::WASM3;
+ features |= WasmFeatures::WIDE_ARITHMETIC;
+
+ // features |= WasmFeatures::YOUR_WASM_FEATURE;
+ // ...
+ }
+ Some(Strategy::Winch) => {
+ features = WasmFeatures::WASM2;
+ features.remove(WasmFeatures::GC_TYPES);
+ features |= WasmFeatures::EXTENDED_CONST;
+ features |= WasmFeatures::MEMORY64;
+ features |= WasmFeatures::MULTI_MEMORY;
+ }
+ Some(Strategy::Auto) => unreachable!(),
+ }
// Next configure some features further based on compile-time features
// of the wasmtime crate itself. For example if "gc" is disabled then
// `GC_TYPES` are disabled (a wasmparser pseudo-feature) as well as
// exceptions, but reference-types is still available (e.g. new
// encodings/types/etc).
- //
- // These features are all "on by default" in effect but dependent on
- // compile-time support being available.
- features.set(WasmFeatures::GC_TYPES, cfg!(feature = "gc"));
- features.set(WasmFeatures::EXCEPTIONS, cfg!(feature = "gc"));
- features.set(WasmFeatures::THREADS, cfg!(feature = "threads"));
+ if !cfg!(feature = "gc") {
+ features.remove(WasmFeatures::GC_TYPES | WasmFeatures::EXCEPTIONS);
+ }
+ if !cfg!(feature = "threads") {
+ features.remove(WasmFeatures::THREADS);
+ }
+
+ // These features aren't included in the base sets above, so explicitly
+ // enable/disable them there based on compiler features. Note that
+ // these are pretty much exclusively runtime-related features so there's
+ // no differentiation here between compilers.
features.set(
WasmFeatures::COMPONENT_MODEL,
cfg!(feature = "component-model"),
@@ -2615,13 +2640,6 @@ impl Config {
// supports one particular platform and not others. Things like that.
features = features & !self.compiler_panicking_wasm_features();
- // Winch can compile GC types (e.g. `externref`) but they're not enabled
- // by default. Exceptions require a GC heap, so they're disabled too.
- #[cfg(any(feature = "cranelift", feature = "winch"))]
- if self.compiler_config.as_ref().and_then(|c| c.strategy) == Some(Strategy::Winch) {
- features.remove(WasmFeatures::GC_TYPES | WasmFeatures::EXCEPTIONS);
- }
-
// And, finally, process all explicitly enabled/disabled features on
// behalf of the embedder's frobbing `Config::wasm_*`. These have the
// highest priority since they were explicitly requested.
@@ -4984,10 +5002,7 @@ impl Engine {
/// Returns the configured [`Config::strategy`] value.
pub fn get_strategy(&self) -> Option<Strategy> {
- #[cfg(any(feature = "cranelift", feature = "winch"))]
- return self.config().compiler_config.as_ref()?.strategy;
- #[cfg(not(any(feature = "cranelift", feature = "winch")))]
- return None;
+ self.config().get_strategy()
}
/// Returns the configured [`Config::collector`] value.
diff --git a/tests/all/defaults.rs b/tests/all/defaults.rs
index e76f341553..4a2d52cd40 100644
--- a/tests/all/defaults.rs
+++ b/tests/all/defaults.rs
@@ -34,12 +34,12 @@ fn test_tail_call_default() -> Result<()> {
),
(
line!(),
- true,
+ false,
Config::new().strategy(Strategy::Winch).target("x86_64")?,
),
(
line!(),
- true,
+ false,
Config::new().strategy(Strategy::Winch).target("aarch64")?,
),
(
diff --git a/tests/all/module.rs b/tests/all/module.rs
index fbdba880c1..4b99a84759 100644
--- a/tests/all/module.rs
+++ b/tests/all/module.rs
@@ -319,12 +319,9 @@ fn tail_call_defaults() -> Result<()> {
wasm_with_tail_calls,
)?;
- if cfg!(any(target_arch = "x86_64", target_arch = "aarch64")) {
- // on by default for Winch on its supported targets
- Module::new(
- &Engine::new(Config::new().strategy(Strategy::Winch))?,
- wasm_with_tail_calls,
- )?;
+ // off by default for Winch for now
+ if let Ok(engine) = Engine::new(Config::new().strategy(Strategy::Winch)) {
+ assert!(Module::new(&engine, wasm_with_tail_calls,).is_err());
}
Ok(())
}
diff --git a/tests/disas/winch/x64/atomic/fence/fence.wat b/tests/disas/winch/x64/atomic/fence/fence.wat
index 9b4a4b038f..1b0c634fd8 100644
--- a/tests/disas/winch/x64/atomic/fence/fence.wat
+++ b/tests/disas/winch/x64/atomic/fence/fence.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat b/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat
index fca088c465..d0e88e1c4d 100644
--- a/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat
+++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(import "env" "memory" (memory 1 1 shared))
diff --git a/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat b/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat
index 23c7a08f2a..9ad597c5bc 100644
--- a/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(import "env" "memory" (memory 1 1 shared))
diff --git a/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat b/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat
index 2a4454b864..b1d3e7d2b5 100644
--- a/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory (data "\00\00\00\00\00\00\f4\7f"))
diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat
index 697736c046..d6cd83ebd9 100644
--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat
+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory (data "\00\00\00\00\00\00\f4\7f"))
diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat
index 133549a68b..a594f96682 100644
--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory (data "\00\00\00\00\00\00\f4\7f"))
diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat
index 70a7f10f30..655aebe811 100644
--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory (data "\00\00\00\00\00\00\f4\7f"))
diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat
index 33ffb6d7e8..c93cb32eb2 100644
--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory (data "\00\00\00\00\00\00\f4\7f"))
diff --git a/tests/disas/winch/x64/atomic/load/large_offset.wat b/tests/disas/winch/x64/atomic/load/large_offset.wat
index 1654aba209..43e694591b 100644
--- a/tests/disas/winch/x64/atomic/load/large_offset.wat
+++ b/tests/disas/winch/x64/atomic/load/large_offset.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 2)
diff --git a/tests/disas/winch/x64/atomic/notify/notify.wat b/tests/disas/winch/x64/atomic/notify/notify.wat
index 11ebd7c97d..60ebbcffd0 100644
--- a/tests/disas/winch/x64/atomic/notify/notify.wat
+++ b/tests/disas/winch/x64/atomic/notify/notify.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/notify/notify_offset.wat b/tests/disas/winch/x64/atomic/notify/notify_offset.wat
index 189e5f40d3..6bfa82fdcf 100644
--- a/tests/disas/winch/x64/atomic/notify/notify_offset.wat
+++ b/tests/disas/winch/x64/atomic/notify/notify_offset.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat
index cc0edf24a2..ebfa87f4e8 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat
index a84a3ddaef..8bd6079b19 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat
index abc3c93bd8..150e51259b 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat
index 52c9c73f40..1f3770d119 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat
index 7ae8f45786..53114bb835 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat
index 1021713945..eeef05d89a 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat
index 0d78dcbbf2..fb8ca3f153 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat
index d65aa73d42..08a1cc61c6 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat
index 2dd2dc71f9..f906c8d1d2 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat
index e9f4fc5345..ed4852c9d8 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat
index 75fbaebf1d..c039eeaae5 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat
index fd055c58f7..ec130d4a53 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat
index d691dcc19f..ceb4f5f13a 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat
index 9e161c86fa..f67c652376 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat
index cbedca161e..2ebbb40839 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat
index 50bf28abe0..22ea6c0fbc 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat
index 4e73ac0c23..84ae052103 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg_computed_address.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg_computed_address.wat
index f723736959..20e1cb8673 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg_computed_address.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg_computed_address.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1)
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat
index 42143d7422..2569897416 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat
index 2987acc19c..9f5870b5a5 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu_extend.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu_extend.wat
index 67fd57c725..a98abd90fe 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu_extend.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu_extend.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat
index 0f54d818d0..5eb755926d 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat
index c40af6d312..559e092566 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat
index 3b0759edf8..208d7d9b47 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat
index 60be2a022f..b6f7bb3ff4 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat
index 6818994f45..0da90bc956 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or_computed_address.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or_computed_address.wat
index 61111d8968..e055abd679 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or_computed_address.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or_computed_address.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1)
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat
index 29acce6c47..b1bbaf85b8 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat
index 101c5ddc27..819833a8e4 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat
index 6ba5961acb..8cc51b06d9 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat
index bb0422157f..c95f492d1f 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat
index bdb0064801..63ebaae9d9 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat
index e2b8981c78..35fe264dc3 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat
index 92c60396b4..73cf8d479d 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat
index cf0eace16f..72f9d5694f 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat
index 889b0e3dfd..f73b26165d 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat
index 3dccc0cffa..249bdc932c 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat
index 1d7e8d2e20..84f34b03c7 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat
index 5e3fed76ef..217de3bb93 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat
index d8d3e86abc..5bbaa99417 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat
index a243a60fbb..02d503a675 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat
index be1c50a0c4..985e1266af 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat
index 87230d7133..ea2c8676c0 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat
index d3ee516b4f..57cd9607aa 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat
index 9af4d5c28f..3593576194 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat
index 5da0033754..d763f0c734 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat
index 95428ae0d8..81fe04c9e8 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat
index a7cf0a6fd4..e684d85256 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat
index 88bda7282d..824c7ec54a 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat
index bfb6ff6cc6..ba1b5373af 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat
index 0656839849..70826d54ea 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat
index 197130fc5e..2e2160c45d 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat b/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat
index a900070a58..167ecd4022 100644
--- a/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat
+++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(import "env" "memory" (memory 1 1 shared))
diff --git a/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat b/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat
index b0462762f7..b3df3fb930 100644
--- a/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat
+++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(import "env" "memory" (memory 1 1 shared))
diff --git a/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat b/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat
index 18ff875281..0504230522 100644
--- a/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat
+++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(import "env" "memory" (memory 1 1 shared))
diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat
index 776e6e434b..6807413b70 100644
--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat
+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(import "env" "memory" (memory 1 1 shared))
diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat
index 4adc0c894a..dab6610598 100644
--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat
+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(import "env" "memory" (memory 1 1 shared))
diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat
index c8a7d91f62..c7fc4edc0e 100644
--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat
+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(import "env" "memory" (memory 1 1 shared))
diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat
index a84bb10007..784969585b 100644
--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat
+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(import "env" "memory" (memory 1 1 shared))
diff --git a/tests/disas/winch/x64/atomic/wait/wait32.wat b/tests/disas/winch/x64/atomic/wait/wait32.wat
index b3a005eb02..c13e8a212c 100644
--- a/tests/disas/winch/x64/atomic/wait/wait32.wat
+++ b/tests/disas/winch/x64/atomic/wait/wait32.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/wait/wait32_offset.wat b/tests/disas/winch/x64/atomic/wait/wait32_offset.wat
index 8c8887168f..073813049a 100644
--- a/tests/disas/winch/x64/atomic/wait/wait32_offset.wat
+++ b/tests/disas/winch/x64/atomic/wait/wait32_offset.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/wait/wait64.wat b/tests/disas/winch/x64/atomic/wait/wait64.wat
index a32cef9310..79f116ee12 100644
--- a/tests/disas/winch/x64/atomic/wait/wait64.wat
+++ b/tests/disas/winch/x64/atomic/wait/wait64.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)
diff --git a/tests/disas/winch/x64/atomic/wait/wait64_offset.wat b/tests/disas/winch/x64/atomic/wait/wait64_offset.wat
index 4d5be9eb39..c8d7011da5 100644
--- a/tests/disas/winch/x64/atomic/wait/wait64_offset.wat
+++ b/tests/disas/winch/x64/atomic/wait/wait64_offset.wat
@@ -1,5 +1,6 @@
;;! target = "x86_64"
;;! test = "winch"
+;;! flags = "-W threads"
(module
(memory 1 1 shared)