Skip to content

Commit 28a7170

Browse files
committed
Changes for 64bit threads support
1 parent 4391048 commit 28a7170

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

src/runtime_init_memory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if (ENVIRONMENT_IS_PTHREAD) {
4343
'shared': true,
4444
#endif
4545
#if MEMORY64 == 1
46-
'index': 'u64',
46+
'index': 'i64',
4747
#endif
4848
});
4949
#if SHARED_MEMORY

test/test_browser.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4151,11 +4151,13 @@ def test_pthread_custom_pthread_main_url(self):
41514151
self.run_browser('test2.html', '/report_result?exit:0')
41524152

41534153
# Test that if the main thread is performing a futex wait while a pthread needs it to do a proxied operation (before that pthread would wake up the main thread), that it's not a deadlock.
4154+
@also_with_wasm64
41544155
@requires_threads
41554156
def test_pthread_proxying_in_futex_wait(self):
41564157
self.btest_exit('pthread/test_pthread_proxying_in_futex_wait.cpp', args=['-O3', '-pthread', '-sPTHREAD_POOL_SIZE'])
41574158

41584159
# Test that sbrk() operates properly in multithreaded conditions
4160+
@also_with_wasm64
41594161
@requires_threads
41604162
def test_pthread_sbrk(self):
41614163
for aborting_malloc in [0, 1]:
@@ -4181,11 +4183,13 @@ def test_pthread_run_on_main_thread(self):
41814183
self.btest_exit('pthread/test_pthread_run_on_main_thread.cpp', args=['-O3', '-pthread', '-sPTHREAD_POOL_SIZE'])
41824184

41834185
# Test how a lot of back-to-back called proxying operations behave.
4186+
@also_with_wasm64
41844187
@requires_threads
41854188
def test_pthread_run_on_main_thread_flood(self):
41864189
self.btest_exit('pthread/test_pthread_run_on_main_thread_flood.cpp', args=['-O3', '-pthread', '-sPTHREAD_POOL_SIZE'])
41874190

41884191
# Test that it is possible to asynchronously call a JavaScript function on the main thread.
4192+
@also_with_wasm64
41894193
@requires_threads
41904194
def test_pthread_call_async(self):
41914195
self.btest_exit('pthread/call_async.c', args=['-pthread'])
@@ -4228,6 +4232,7 @@ def test_pthread_global_data_initialization_in_sync_compilation_mode(self):
42284232
def test_pthread_clock_drift(self):
42294233
self.btest_exit('pthread/test_pthread_clock_drift.cpp', args=['-O3', '-pthread', '-sPROXY_TO_PTHREAD'])
42304234

4235+
@also_with_wasm64
42314236
@requires_threads
42324237
def test_pthread_utf8_funcs(self):
42334238
self.btest_exit('pthread/test_pthread_utf8_funcs.cpp', args=['-pthread', '-sPTHREAD_POOL_SIZE'])
@@ -4239,16 +4244,19 @@ def test_pthread_wake_all(self):
42394244
self.btest_exit('pthread/test_futex_wake_all.cpp', args=['-O3', '-pthread', '-sINITIAL_MEMORY=64MB'])
42404245

42414246
# Test that stack base and max correctly bound the stack on pthreads.
4247+
@also_with_wasm64
42424248
@requires_threads
42434249
def test_pthread_stack_bounds(self):
42444250
self.btest_exit('pthread/test_pthread_stack_bounds.cpp', args=['-pthread'])
42454251

42464252
# Test that real `thread_local` works.
4253+
@also_with_wasm64
42474254
@requires_threads
42484255
def test_pthread_tls(self):
42494256
self.btest_exit('pthread/test_pthread_tls.cpp', args=['-sPROXY_TO_PTHREAD', '-pthread'])
42504257

42514258
# Test that real `thread_local` works in main thread without PROXY_TO_PTHREAD.
4259+
@also_with_wasm64
42524260
@requires_threads
42534261
def test_pthread_tls_main(self):
42544262
self.btest_exit('pthread/test_pthread_tls_main.cpp', args=['-pthread'])
@@ -4977,6 +4985,7 @@ def test_single_file_worker_js(self):
49774985
# program can run either on the main thread (normal tests) or when we start it in
49784986
# a Worker in this test (in that case, both the main application thread and the worker threads
49794987
# are all inside Web Workers).
4988+
@also_with_wasm64
49804989
@requires_threads
49814990
def test_pthreads_started_in_worker(self):
49824991
self.set_setting('EXIT_RUNTIME')
@@ -5106,6 +5115,7 @@ def test_emscripten_set_interval(self):
51065115
self.btest_exit('emscripten_set_interval.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])
51075116

51085117
# Test emscripten_performance_now() and emscripten_date_now()
5118+
@also_with_wasm64
51095119
@requires_threads
51105120
def test_emscripten_performance_now(self):
51115121
self.btest('emscripten_performance_now.c', '0', args=['-pthread', '-sPROXY_TO_PTHREAD'])

0 commit comments

Comments
 (0)