[EH] Add more manual tests for new Wasm EH #21913

aheejin · 2024-05-08T23:17:32Z

The testing mode for the new Wasm EH (exnref) was added in with_all_eh_sjlj and with_all_sjlj in #21906. But this adds the new Wasm EH test mode for more tests that are not covered by those decorators.

The testing mode for the new Wasm EH (exnref) was added in `with_all_eh_sjlj` and `with_all_sjlj` in emscripten-core#21906. But this adds the new Wasm EH test mode for more tests that are not covered by those decorators.

sbc100 · 2024-05-08T23:45:02Z

test/test_core.py

@@ -915,6 +915,10 @@ def test_longjmp_with_and_without_exceptions(self):
    self.emcc_args.append('-fwasm-exceptions')
    for arg in ['-fwasm-exceptions', '-fno-exceptions']:
      self.do_core_test('test_longjmp.c', emcc_args=[arg])
+    # Wasm SjLj with and with new experimental EH support
+    self.require_new_wasm_eh()


Doesn't adding this mean that this test now can't be run with out new eh?

If so, why not use the decorator?

Hmm you're right; I was confused and somehow assumed we were able to run the two tests and kind of skip this part with node < 22.. Not sure why I've assumed that.

Using the decorator means thie tests only runs on node 22. Do we run non-wasm64 core tests on node 22?

Used the decorator: 6691a92

sbc100 · 2024-05-08T23:45:31Z

test/test_other.py

-                      # still works until removed.
-                      '--embind-emit-tsd', 'embind_tsgen.d.ts', '-Wno-deprecated'])
-    self.assertFileContents(test_file('other/embind_tsgen.d.ts'), read_file('embind_tsgen.d.ts'))
+    for wasm_exnref in [0, 1]:


Can you use @parameterize here instead of the loop?

Something like:

@parameterize({ '', [0], 'wasm_exnref', [1], })

Done: db345b2

sbc100 · 2024-05-08T23:51:06Z

test/test_other.py

+    self.do_run_in_out_file_test('core/test_exceptions.cpp', out_suffix='_caught')
+    # New Wasm EH with exnref
+    self.require_wasm_exnref()
+    self.set_setting('WASM_EXNREF')


Again I wonder if that can parameterized instead?

We can, but does this run on node 22?

You can select specific tests to to run on node canary. They are listed in the .circleci config.

It looks test-wasm64 and test-wasm64-4gb

emscripten/.circleci/config.yml

Lines 636 to 675 in 2a08958

test-wasm64:

# We don't use `bionic` here since its tool old to run recent node versions:

# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`

executor: linux-python

steps:

- prepare-for-tests

# The linux-python image uses /home/circleci rather than /root and jsvu

# hardcodes /root into its launcher scripts so we need to reinstall v8.

- run: rm -rf $HOME/.jsvu

- install-v8

- install-node-canary

- run-tests:

title: "wasm64"

test_targets: "

wasm64

core_2gb.test_*em_asm*

core_2gb.test_*embind*

wasm64l.test_bigswitch

other.test_memory64_proxies

other.test_failing_growth_wasm64"

- upload-test-results

test-wasm64-4gb:

environment:

LANG: "C.UTF-8"

# Only run 2 tests at a time to avoid OOM (since each tests used >4gb)

EMCC_CORES: "2"

# We don't use `bionic` here since its too old to run recent node versions:

# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`

executor: linux-python

steps:

- prepare-for-tests

# The linux-python image uses /home/circleci rather than /root and jsvu

# hardcodes /root into its launcher scripts so we need to reinstall v8.

- run: rm -rf $HOME/.jsvu

- install-v8

- install-node-canary

- run-tests:

title: "wasm64_4gb"

test_targets: "wasm64_4gb"

- upload-test-results

and some tests in test-compat

emscripten/.circleci/config.yml

Lines 726 to 752 in 2a08958

test-node-compat:

# We don't use `bionic` here since its too old to run recent node versions:

# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`

executor: linux-python

environment:

LANG: "C.UTF-8"

EMTEST_SKIP_V8: "1"

steps:

- checkout

- run:

name: submodule update

command: git submodule update --init

- pip-install

- install-emsdk

- install-node-canary

- run-tests:

title: "node (canary)"

test_targets: "

other.test_deterministic

other.test_gen_struct_info

other.test_native_call_before_init

other.test_node_unhandled_rejection

core2.test_hello_world

core0.test_pthread_join_and_asyncify

core0.test_async_ccall_promise_jspi

core0.test_async_ccall_promise_exit_runtime_jspi

core0.test_cubescript_jspi"

are running on node canary, right?

Then I wonder, why are these tests, which has self.require_wasm_exnref(), passing in test-core0 and test-other? test-core0 and test-other don't seem to run on node canary, right? They say ok instead of skipped...

test_exceptions_with_and_without_longjmp (test_core.core0) ... ok (9.40s) test_longjmp_with_and_without_exceptions (test_core.core0) ... ok (6.01s) test_lto_wasm_exceptions (test_other.other) ... ok (8.19s) test_standalone_wasm_exceptions (test_other.other) ... ok (2.03s)

test-core0 log:
https://app.circleci.com/pipelines/github/emscripten-core/emscripten/35053/workflows/a5482f96-8732-4e8f-b7ba-bce7fb9a77ab/jobs/783071
test-other log:
https://app.circleci.com/pipelines/github/emscripten-core/emscripten/35053/workflows/a5482f96-8732-4e8f-b7ba-bce7fb9a77ab/jobs/783072

I think that is because v8 is installed, which also satisfies the require_wasm_exnref requirement.
See https://app.circleci.com/pipelines/github/emscripten-core/emscripten/35053/workflows/a5482f96-8732-4e8f-b7ba-bce7fb9a77ab/jobs/783041

Added @requires_wasm_exnref to all relevant tests I modified here, and removed self.require_wasm_eh() and self.require_wasm_exnref(). Didn't add them to the list of node-canary tests, given that they can run on v8 anyway: 6691a92

sbc100 · 2024-05-10T16:40:30Z

test/test_other.py

+    'wasm_exnref': [1]
+  })
+  def test_embind_tsgen_exceptions(self, wasm_exnref):
+    self.set_setting('WASM_EXNREF', wasm_exnref)


Presumably this should have:

if wasm_exnref: self.requires_wasm_enxref()

This only runs compilation and does not run it. Note that there was no self.require_wasm_eh() before.

sbc100 · 2024-05-10T16:40:59Z

test/test_other.py

@@ -8830,7 +8837,8 @@ def test_lto(self, args):
  @parameterized({
    'noexcept': [],
    'except': ['-sDISABLE_EXCEPTION_CATCHING=0'],
-    'except_wasm': ['-fwasm-exceptions']
+    'except_wasm': ['-fwasm-exceptions'],
+    'except_wasm_exnref': ['-fwasm-exceptions', '-sWASM_EXNREF']


[EH] Add more manual tests for new Wasm EH

f50de5b

The testing mode for the new Wasm EH (exnref) was added in `with_all_eh_sjlj` and `with_all_sjlj` in emscripten-core#21906. But this adds the new Wasm EH test mode for more tests that are not covered by those decorators.

aheejin requested review from kripken and sbc100 May 8, 2024 23:17

sbc100 reviewed May 8, 2024

View reviewed changes

aheejin added 3 commits May 9, 2024 23:52

new_wasm -> wasm_exnref

6de2093

parameterize test_embind_tsgen_exceptions

db345b2

Use @requires_wasm_exnref decorator

6691a92

sbc100 reviewed May 10, 2024

View reviewed changes

sbc100 approved these changes May 10, 2024

View reviewed changes

aheejin merged commit 7e7c057 into emscripten-core:main May 10, 2024
29 checks passed

aheejin deleted the more_eh_tests branch May 10, 2024 17:24

	test-wasm64:
	# We don't use `bionic` here since its tool old to run recent node versions:
	# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`
	executor: linux-python
	steps:
	- prepare-for-tests
	# The linux-python image uses /home/circleci rather than /root and jsvu
	# hardcodes /root into its launcher scripts so we need to reinstall v8.
	- run: rm -rf $HOME/.jsvu
	- install-v8
	- install-node-canary
	- run-tests:
	title: "wasm64"
	test_targets: "
	wasm64
	core_2gb.test_em_asm
	core_2gb.test_embind
	wasm64l.test_bigswitch
	other.test_memory64_proxies
	other.test_failing_growth_wasm64"
	- upload-test-results
	test-wasm64-4gb:
	environment:
	LANG: "C.UTF-8"
	# Only run 2 tests at a time to avoid OOM (since each tests used >4gb)
	EMCC_CORES: "2"
	# We don't use `bionic` here since its too old to run recent node versions:
	# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`
	executor: linux-python
	steps:
	- prepare-for-tests
	# The linux-python image uses /home/circleci rather than /root and jsvu
	# hardcodes /root into its launcher scripts so we need to reinstall v8.
	- run: rm -rf $HOME/.jsvu
	- install-v8
	- install-node-canary
	- run-tests:
	title: "wasm64_4gb"
	test_targets: "wasm64_4gb"
	- upload-test-results

	test-node-compat:
	# We don't use `bionic` here since its too old to run recent node versions:
	# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`
	executor: linux-python
	environment:
	LANG: "C.UTF-8"
	EMTEST_SKIP_V8: "1"
	steps:
	- checkout
	- run:
	name: submodule update
	command: git submodule update --init
	- pip-install
	- install-emsdk
	- install-node-canary
	- run-tests:
	title: "node (canary)"
	test_targets: "
	other.test_deterministic
	other.test_gen_struct_info
	other.test_native_call_before_init
	other.test_node_unhandled_rejection
	core2.test_hello_world
	core0.test_pthread_join_and_asyncify
	core0.test_async_ccall_promise_jspi
	core0.test_async_ccall_promise_exit_runtime_jspi
	core0.test_cubescript_jspi"

[EH] Add more manual tests for new Wasm EH #21913

[EH] Add more manual tests for new Wasm EH #21913

Uh oh!

Conversation

aheejin commented May 8, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aheejin May 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aheejin May 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

aheejin May 10, 2024 •

edited

Loading

aheejin May 10, 2024 •

edited

Loading