Roll Emdawnwebgpu and repoint USE_WEBGPU tests at Emdawnwebgpu

src/jsifier.mjs

@@ -288,7 +288,7 @@ function handleI64Signatures(symbol, snippet, sig, i53abi) {
     const newArgs = [];
     let argConversions = '';
     if (sig.length > argNames.length + 1) {
-      error(`handleI64Signatures: signature too long for ${symbol}`);
+      error(`handleI64Signatures: signature '${sig}' too long for ${symbol}(${argNames.join(', ')})`);
       return snippet;
     }
     for (let i = 0; i < argNames.length; i++) {

test/test_browser.py

@@ -26,6 +26,7 @@
 from common import HttpServerThread, requires_dev_dependency
 from tools import shared
 from tools import ports
+from tools.shared import config
 from tools.shared import EMCC, WINDOWS, FILE_PACKAGER, PIPE, DEBUG
 from tools.utils import delete_dir
 
@@ -4454,30 +4455,24 @@ def test_webgl_simple_extensions(self, webgl_version, simple_enable_extensions):
     self.btest_exit('webgl2_simple_enable_extensions.c', cflags=cmd)
 
   @parameterized({
-    '': ([],),
-    'closure': (['-sASSERTIONS', '--closure=1'],),
-    'closure_advanced': (['-sASSERTIONS', '--closure=1', '-O3'],),
-    'main_module': (['-sMAIN_MODULE=1'],),
+    '': (True, []),
+    'closure': (True, ['-sASSERTIONS', '--closure=1']),
+    'closure_advanced': (True, ['-sASSERTIONS', '--closure=1', '-O3']),
+    # Not precached with PIC
+    'main_module': (False, ['-sMAIN_MODULE=1']),
+    # Not precached with SHARED_MEMORY
+    'pthreads': (False, ['-pthread', '-sOFFSCREENCANVAS_SUPPORT']),
   })
   @requires_webgpu
-  def test_webgpu_basic_rendering(self, args):
-    self.btest_exit('webgpu_basic_rendering.cpp', cflags=['-Wno-error=deprecated', '-sUSE_WEBGPU'] + args)
+  def test_webgpu_basic_rendering(self, assume_precached, args):
+    if config.FROZEN_CACHE and not assume_precached:
+      self.skipTest("test doesn't work with frozen cache")
+    self.btest_exit('webgpu_basic_rendering.cpp', cflags=['--use-port=emdawnwebgpu', '-sEXIT_RUNTIME'] + args)
 
   @requires_webgpu
   def test_webgpu_required_limits(self):
-    self.btest_exit('webgpu_required_limits.c', cflags=['-Wno-error=deprecated', '-sUSE_WEBGPU', '-sASYNCIFY'])
-
-  @requires_webgpu
-  def test_webgpu_basic_rendering_pthreads(self):
-    self.btest_exit('webgpu_basic_rendering.cpp', cflags=['-Wno-error=deprecated', '-sUSE_WEBGPU', '-pthread', '-sOFFSCREENCANVAS_SUPPORT'])
-
-  @requires_webgpu
-  def test_webgpu_get_device(self):
-    self.btest_exit('webgpu_get_device.cpp', cflags=['-Wno-error=deprecated', '-sUSE_WEBGPU', '-sASSERTIONS', '--closure=1'])
-
-  @requires_webgpu
-  def test_webgpu_get_device_pthreads(self):
-    self.btest_exit('webgpu_get_device.cpp', cflags=['-Wno-error=deprecated', '-sUSE_WEBGPU', '-pthread'])
+    self.set_setting('DEFAULT_TO_CXX')  # emdawnwebgpu uses C++ internally
+    self.btest_exit('webgpu_required_limits.c', cflags=['--use-port=emdawnwebgpu'])
 
   # Tests the feature that shell html page can preallocate the typed array and place it
   # to Module.buffer before loading the script page.

test/test_other.py

@@ -2586,6 +2586,7 @@ def test_contrib_ports(self):
 
   @requires_network
   def test_remote_ports(self):
+    self.set_setting('DEFAULT_TO_CXX')  # emdawnwebgpu uses C++ internally
     self.emcc(test_file('hello_world.c'), ['--use-port=emdawnwebgpu'])
 
   @crossplatform
@@ -9652,13 +9653,15 @@ def test_closure_full_js_library(self, args):
 
   @also_with_wasm64
   def test_closure_webgpu(self):
-    # This test can be removed if USE_WEBGPU is later included in INCLUDE_FULL_LIBRARY.
+    if config.FROZEN_CACHE and self.get_setting('MEMORY64'):
+      # CI configuration doesn't run `embuilder` with wasm64 on ports
+      self.skipTest("test doesn't work with frozen cache")
+    self.set_setting('DEFAULT_TO_CXX')  # emdawnwebgpu uses C++ internally
     self.build('hello_world.c', cflags=[
       '--closure=1',
       '-Werror=closure',
-      '-Wno-error=deprecated',
       '-sINCLUDE_FULL_LIBRARY',
-      '-sUSE_WEBGPU',
+      '--use-port=emdawnwebgpu',
     ])
 
   # Tests --closure-args command line flag
@@ -12298,24 +12301,19 @@ def test_standalone_syscalls(self):
     for engine in config.WASM_ENGINES:
       self.assertContained(expected, self.run_js('test.wasm', engine))
 
-  @parameterized({
-    '': ([],),
-    'assertions': (['-sASSERTIONS'],),
-    'closure': (['-sASSERTIONS', '--closure=1'],),
-    'dylink': (['-sMAIN_MODULE'],),
-  })
-  def test_webgpu_compiletest(self, args):
-    self.run_process([EMXX, test_file('webgpu_jsvalstore.cpp'), '-Wno-error=deprecated', '-sUSE_WEBGPU', '-sASYNCIFY'] + args)
-
   @flaky('https://github.com/emscripten-core/emscripten/issues/25343')
+  @crossplatform
   @also_with_wasm64
   @parameterized({
     '': ([],),
     'closure': (['--closure=1', '-Werror=closure'],),
     'closure_assertions': (['--closure=1', '-Werror=closure', '-sASSERTIONS'],),
   })
   def test_emdawnwebgpu_link_test(self, args):
-    self.run_process([EMXX, test_file('test_emdawnwebgpu_link_test.cpp'), '--use-port=emdawnwebgpu', '-sASYNCIFY'] + args)
+    if config.FROZEN_CACHE and self.get_setting('MEMORY64'):
+      # CI configuration doesn't run `embuilder` with wasm64 on ports
+      self.skipTest("test doesn't work with frozen cache")
+    self.emcc(test_file('test_emdawnwebgpu_link_test.cpp'), ['--use-port=emdawnwebgpu', '-sASYNCIFY'] + args)
 
   def test_signature_mismatch(self):
     create_file('a.c', 'void foo(); int main() { foo(); return 0; }')