Get tests passing under wasmtime 18 using preview2 / WASI 0.2 primitives

[brettcannon]

This is a tracking issue for getting wasmtime --wasi preview2 working for wasmtime 18+ (older versions had bugs we needed fixed).

• main
• 3.12
• 3.11

Linked PRs

• GH-116313: get WASI builds to run under wasmtime 18 w/ WASI 0.2/preview2 primitives #116327
• [3.12] GH-116313: get WASI builds to run under wasmtime 18 w/ WASI 0.2/preview2 primitives (GH-116327) #116373
• [3.11] GH-116313: get WASI builds to run under wasmtime 18 w/ WASI 0.2/preview2 primitives (GH-116327) (GH-116373) #116384

[brettcannon]

A test run on main just passed! I still want to check 3.12 and 3.11.

diff --git a/Tools/wasm/wasi.py b/Tools/wasm/wasi.py
index 1e75db5c7b..d5317228fe 100644
--- a/Tools/wasm/wasi.py
+++ b/Tools/wasm/wasi.py
@@ -284,7 +284,8 @@ def main():
                         # which equates to 8291 KiB.
                         "--wasm max-wasm-stack=8388608 "
                         # Enable thread support.
-                        "--wasm threads=y --wasi threads=y "
+                        #"--wasm threads=y --wasi threads=y "
+                        "--wasi preview2 "
                         # Map the checkout to / to load the stdlib from /Lib.
                         "--dir {HOST_DIR}::{GUEST_DIR} "
                         # Set PYTHONPATH to the sysconfig data.

[brettcannon]

It also works under 3.12! As such, I don't assume any issues under 3.11.

diff --git a/Tools/wasm/wasm_build.py b/Tools/wasm/wasm_build.py
index c9947057a9..f6e2629656 100755
--- a/Tools/wasm/wasm_build.py
+++ b/Tools/wasm/wasm_build.py
@@ -316,8 +316,10 @@ def _check_wasi():
         # workaround for https://github.com/python/cpython/issues/95952
         "HOSTRUNNER": (
             "wasmtime run "
-            "--env PYTHONPATH=/{relbuilddir}/build/lib.wasi-wasm32-{version}:/Lib "
-            "--mapdir /::{srcdir} --"
+            "--wasm max-wasm-stack=8388608 "
+            "--wasi preview2 "
+            "--dir {srcdir}::/ "
+            "--env PYTHONPATH=/{relbuilddir}/build/lib.wasi-wasm32-{version}:/Lib"
         ),
         "PATH": [WASI_SDK_PATH / "bin", os.environ["PATH"]],
     },
diff --git a/configure.ac b/configure.ac
index 384718db1f..b3eaaa9246 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1601,7 +1601,7 @@ then
     dnl TODO: support other WASI runtimes
     dnl wasmtime starts the proces with "/" as CWD. For OOT builds add the
     dnl directory containing _sysconfigdata to PYTHONPATH.
-    [WASI/*], [HOSTRUNNER='wasmtime run --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt):/Lib --mapdir /::$(srcdir) --'],
+    [WASI/*], [HOSTRUNNER='wasmtime run --wasm max-wasm-stack=8388608 --wasi preview2 --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt):/Lib --dir $(srcdir)::/'],
     [HOSTRUNNER='']
   )
 fi

[brettcannon]

I think I need python/buildmaster-config#469 merged before the PRs will pass on all the WASI buildbots.