use jspi

Author: ngxson

ggml/CMakeLists.txt

@@ -189,6 +189,7 @@ option(GGML_VULKAN_VALIDATE                 "ggml: enable Vulkan validation"
 option(GGML_VULKAN_RUN_TESTS                "ggml: run Vulkan tests"                          OFF)
 option(GGML_WEBGPU                          "ggml: use WebGPU"                                OFF)
 option(GGML_WEBGPU_DEBUG                    "ggml: enable WebGPU debug output"                OFF)
+option(GGML_WEBGPU_JSPI                     "ggml: use JSPI for WebGPU"                       ON)
 option(GGML_ZDNN                            "ggml: use zDNN"                                  OFF)
 option(GGML_METAL                           "ggml: use Metal"                                 ${GGML_METAL_DEFAULT})
 option(GGML_METAL_USE_BF16                  "ggml: use bfloat if available"                   OFF)

ggml/src/ggml-webgpu/CMakeLists.txt

@@ -42,11 +42,19 @@ if(EMSCRIPTEN)
     if(NOT EMDAWNWEBGPU_DIR)
         # default built-in port
         target_compile_options(ggml-webgpu PRIVATE "--use-port=emdawnwebgpu")
-        target_link_options(ggml-webgpu INTERFACE "--use-port=emdawnwebgpu" "-sASYNCIFY=1")
+        target_link_options(ggml-webgpu INTERFACE "--use-port=emdawnwebgpu")
     else()
         # custom port
         target_compile_options(ggml-webgpu PRIVATE "--use-port=${EMDAWNWEBGPU_DIR}/emdawnwebgpu.port.py")
-        target_link_options(ggml-webgpu INTERFACE "--use-port=${EMDAWNWEBGPU_DIR}/emdawnwebgpu.port.py" "-sASYNCIFY=1")
+        target_link_options(ggml-webgpu INTERFACE "--use-port=${EMDAWNWEBGPU_DIR}/emdawnwebgpu.port.py")
+    endif()
+
+    if (GGML_WEBGPU_JSPI)
+        target_compile_options(ggml-webgpu PRIVATE "-fwasm-exceptions")
+        target_link_options(ggml-webgpu INTERFACE "-sJSPI" "-fwasm-exceptions")
+    else()
+        target_compile_options(ggml-webgpu PRIVATE "-fexceptions")
+        target_link_options(ggml-webgpu INTERFACE "-sASYNCIFY" "-exceptions")
     endif()
 
     set(DawnWebGPU_TARGET webgpu_cpp)
@@ -58,8 +66,7 @@ endif()
 if (GGML_WEBGPU_DEBUG)
     target_compile_definitions(ggml-webgpu PRIVATE GGML_WEBGPU_DEBUG=1)
     if(EMSCRIPTEN)
-        target_compile_options(ggml-webgpu PRIVATE "-fexceptions")
-        target_link_options(ggml-webgpu INTERFACE "-sASSERTIONS=2" "-fexceptions")
+        target_link_options(ggml-webgpu INTERFACE "-sASSERTIONS=2")
     endif()
 endif()
 

ggml/src/ggml-webgpu/ggml-webgpu.cpp

@@ -1297,12 +1297,8 @@ ggml_backend_reg_t ggml_backend_webgpu_reg() {
     webgpu_ctx->instance                                     = wgpu::CreateInstance(&instance_descriptor);
 
 #ifdef __EMSCRIPTEN__
-#ifndef __EMSCRIPTEN_PTHREADS__
-    GGML_LOG_WARN("ggml_webgpu: pthread is disabled. This may cause bugs\n");
-#endif
-
     if (webgpu_ctx->instance == nullptr) {
-        GGML_LOG_ERROR("ggml_webgpu: Failed to create WebGPU instance. Make sure -sASYNCIFY is set\n");
+        GGML_LOG_ERROR("ggml_webgpu: Failed to create WebGPU instance. Make sure either -sASYNCIFY or -sJSPI is set\n");
         return nullptr;
     }
 #endif