chore: Add support for wasm32-wasi-pthread target

Author: robertoraggi

.github/workflows/ci.yml

@@ -194,6 +194,7 @@ jobs:
       - name: Test
         run: |
           wasmtime \
+            -W threads=y -S threads=y \
             --dir ${{github.workspace}}/build.wasi/install::/ \
             --dir tests::tests \
             ${{github.workspace}}/build.wasi/install/usr/bin/cxx.wasm -v tests/manual/source.cc
@@ -205,6 +206,7 @@ jobs:
           for i in src/parser/cxx/*.cc src/lsp/cxx/lsp/*.cc src/frontend/cxx/*.cc; do
             echo "Parsing $i"
             wasmtime \
+                  -W threads=y -S threads=y \
                   --dir=src::/src \
                   --dir=build.wasi/_deps::/build.wasi/_deps \
                   --dir=build.wasi/src/parser::build.wasi/src/parser \

CMakePresets.json

@@ -28,9 +28,9 @@
       "displayName": "emscripten",
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build.em",
+      "toolchainFile": "$env{EMSCRIPTEN_ROOT}/cmake/Modules/Platform/Emscripten.cmake",
       "cacheVariables": {
         "CMAKE_EXPORT_COMPILE_COMMANDS": "YES",
-        "CMAKE_TOOLCHAIN_FILE": "$env{EMSCRIPTEN_ROOT}/cmake/Modules/Platform/Emscripten.cmake",
         "CMAKE_BUILD_TYPE": "Release",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build.em/install/usr",
         "CMAKE_INTERPROCEDURAL_OPTIMIZATION": "YES",
@@ -48,9 +48,9 @@
       "displayName": "wasi",
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build.wasi",
+      "toolchainFile": "$env{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake",
       "cacheVariables": {
         "CMAKE_EXPORT_COMPILE_COMMANDS": "YES",
-        "CMAKE_TOOLCHAIN_FILE": "$env{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake",
         "CMAKE_BUILD_TYPE": "Release",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build.wasi/install/usr",
         "CMAKE_INTERPROCEDURAL_OPTIMIZATION": "YES",
@@ -62,6 +62,11 @@
         "lhs": "$env{WASI_SDK_PATH}",
         "rhs": ""
       }
+    },
+    {
+      "name": "wasi-threads",
+      "inherits": "wasi",
+      "toolchainFile": "$env{WASI_SDK_PATH}/share/cmake/wasi-sdk-pthread.cmake"
     }
   ],
   "buildPresets": [
@@ -95,6 +100,15 @@
       "name": "install-wasi",
       "configurePreset": "wasi",
       "targets": ["install"]
+    },
+    {
+      "name": "build-wasi-threads",
+      "configurePreset": "wasi-threads"
+    },
+    {
+      "name": "install-wasi-threads",
+      "configurePreset": "wasi-threads",
+      "targets": ["install"]
     }
   ],
   "testPresets": [
@@ -109,10 +123,6 @@
     {
       "name": "emscripten",
       "configurePreset": "emscripten"
-    },
-    {
-      "name": "wasi",
-      "configurePreset": "wasi"
     }
   ],
   "workflowPresets": [
@@ -166,6 +176,19 @@
           "name": "install-wasi"
         }
       ]
+    },
+    {
+      "name": "wasi-threads",
+      "steps": [
+        {
+          "type": "configure",
+          "name": "wasi-threads"
+        },
+        {
+          "type": "build",
+          "name": "install-wasi-threads"
+        }
+      ]
     }
   ]
 }

scripts/cxx-wasmtime.mjs

@@ -28,14 +28,18 @@ const cxxWasiPrefixPath = path.join(workspacePath, "build.wasi/install");
 const wasmtime = await which("wasmtime");
 
 const cxxArgs = [
+  "-W",
+  "threads=y",
+  "-S",
+  "threads=y",
   `--dir=${cxxWasiPrefixPath}/usr::/usr`,
   `--dir=${process.cwd()}::/`,
   `${cxxWasiPrefixPath}/usr/bin/cxx.wasm`,
 ];
 
 try {
   const result = await $`${wasmtime} ${cxxArgs} ${process.argv.slice(
-    3,
+    3
   )}`.quiet();
 
   echo`${result}`;

src/frontend/CMakeLists.txt

@@ -45,6 +45,14 @@ endif()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "WASI")
     set_target_properties(cxx PROPERTIES SUFFIX ".wasm")
+
+    if (Threads_FOUND)
+        target_link_options(cxx PRIVATE
+            "SHELL:-Wl,--import-memory"
+            "SHELL:-Wl,--export-memory"
+            "SHELL:-Wl,--max-memory=134217728"
+        )
+    endif()
 endif()
 
 if(CXX_INTERPROCEDURAL_OPTIMIZATION)