[wasm64] Fix and run all pthread browser tests

.circleci/config.yml

@@ -820,6 +820,7 @@ jobs:
             browser64.test_fetch_xhr_abort
             browser64.test_fetch_sync_xhr
             browser64.test_fetch_implicit_append
+            browser64.test_pthread_*
             "
   test-browser-firefox:
     executor: bionic

src/jsifier.js

@@ -246,10 +246,13 @@ function(${args}) {
             if (oneliner) {
               body = `return ${body}`;
             }
+            const rtnType = sig && sig.length ? sig[0] : null;
+            const proxyFunc = (MEMORY64 && rtnType == 'p') ? 'proxyToMainThreadPtr' : 'proxyToMainThread';
+            deps.push('$' + proxyFunc);
             return `
 function(${args}) {
 if (ENVIRONMENT_IS_PTHREAD)
-  return proxyToMainThread(${proxiedFunctionTable.length}, ${+sync}${args ? ', ' : ''}${args});
+  return ${proxyFunc}(${proxiedFunctionTable.length}, ${+sync}${args ? ', ' : ''}${args});
 ${body}
 }\n`
           });

src/library_pthread.js

@@ -948,7 +948,15 @@ var LibraryPThread = {
     _exit(returnCode);
   },
 
-  $proxyToMainThread__deps: ['$withStackSave', '_emscripten_run_on_main_thread_js'],
+#if MEMORY64
+  // Calls proxyToMainThread but returns a bigint rather than a number
+  $proxyToMainThreadPtr__deps: ['$proxyToMainThread'],
+  $proxyToMainThreadPtr: function() {
+    return BigInt(proxyToMainThread.apply(null, arguments));
+  },
+#endif
+
+  $proxyToMainThread__deps: ['$withStackSave', '_emscripten_run_on_main_thread_js'].concat(i53ConversionDeps),
   $proxyToMainThread__docs: '/** @type{function(number, (number|boolean), ...(number|boolean))} */',
   $proxyToMainThread: function(index, sync) {
     // Additional arguments are passed after those two, which are the actual
@@ -1032,6 +1040,19 @@ var LibraryPThread = {
     PThread.currentProxiedOperationCallerThread = callingThread;
     var rtn = func.apply(null, proxiedJSCallArgs);
     PThread.currentProxiedOperationCallerThread = 0;
+#if MEMORY64
+    // In memory64 mode some proxied functions return bigint/pointer but
+    // our return type is i53/double.
+    if (typeof rtn == "bigint") {
+      rtn = bigintToI53Checked(rtn);
+    }
+#endif
+#if ASSERTIONS
+    // Proxied functions can return any type except bigint.  All other types
+    // cooerce to f64/double (the return type of this function in C) but not
+    // bigint.
+    assert(typeof rtn != "bigint");
+#endif
     return rtn;
   },
 

src/preamble_minimal.js

@@ -100,12 +100,15 @@ if (!ENVIRONMENT_IS_PTHREAD) {
     Module['mem'] ||
 #endif
     new WebAssembly.Memory({
-    'initial': {{{ INITIAL_MEMORY >>> 16 }}}
+      'initial': {{{ INITIAL_MEMORY >>> 16 }}},
 #if SHARED_MEMORY || !ALLOW_MEMORY_GROWTH || MAXIMUM_MEMORY != FOUR_GB
-    , 'maximum': {{{ (ALLOW_MEMORY_GROWTH && MAXIMUM_MEMORY != FOUR_GB ? MAXIMUM_MEMORY : INITIAL_MEMORY) >>> 16 }}}
+      'maximum': {{{ (ALLOW_MEMORY_GROWTH && MAXIMUM_MEMORY != FOUR_GB ? MAXIMUM_MEMORY : INITIAL_MEMORY) >>> 16 }}},
 #endif
 #if SHARED_MEMORY
-    , 'shared': true
+      'shared': true,
+#endif
+#if MEMORY64 == 1
+      'index': 'i64',
 #endif
     });
 #if PTHREADS

test/common.py

@@ -169,6 +169,14 @@ def no_windows(note=''):
   return lambda f: f
 
 
+def no_wasm64(note=''):
+  assert not callable(note)
+
+  def decorated(f):
+    return skip_if(f, 'is_wasm64', note)
+  return decorated
+
+
 def only_windows(note=''):
   assert not callable(note)
   if not WINDOWS:
@@ -574,6 +582,9 @@ def is_wasm(self):
   def is_browser_test(self):
     return False
 
+  def is_wasm64(self):
+    return self.get_setting('MEMORY64')
+
   def check_dylink(self):
     if self.get_setting('ALLOW_MEMORY_GROWTH') == 1 and not self.is_wasm():
       self.skipTest('no dynamic linking with memory growth (without wasm)')

test/pthread/call_sync_on_main_thread.js

@@ -3,7 +3,7 @@ addToLibrary({
   // This function returns the inner text of the given element
   // Because it accesses the DOM, it must be called on the main thread.
   getDomElementContents__proxy: 'sync',
-  getDomElementContents__sig: 'viii',
+  getDomElementContents__sig: 'pp',
   getDomElementContents__deps: ['$stringToNewUTF8'],
   getDomElementContents: function(domElementSelector) {
     var selector = UTF8ToString(domElementSelector);

test/pthread/test_futex_wake_all.cpp

@@ -57,7 +57,7 @@ void *WaitingThread(void *arg)
 
 int main()
 {
-	for(int i = 0; i < NUM_THREADS; ++i)
+	for(intptr_t i = 0; i < NUM_THREADS; ++i)
 	{
 		pthread_create(waitingThreads+i, 0, WaitingThread, (void*)i);
 	}

test/pthread/test_large_pthread_allocation.cpp

@@ -21,7 +21,7 @@ static void *thread_start(void *arg)
   pthread_exit((void*)0);
 }
 
-void CreateThread(int idx) {
+void CreateThread(intptr_t idx) {
   int rc = pthread_create(&threads[idx], NULL, thread_start, (void*)idx);
   assert(rc == 0);
 }

test/pthread/test_pthread_barrier.cpp

@@ -44,7 +44,7 @@ void *thread_main(void *arg)
     }
 
     // Then each thread sums the one intermediate vector.
-    int totalSum = 0;
+    intptr_t totalSum = 0;
     for(int i = 0; i < N; ++i)
         totalSum += intermediate[i];
 
@@ -70,9 +70,10 @@ int main(int argc, char **argv)
     int ret = pthread_barrier_init(&barr, NULL, THREADS);
     assert(ret == 0);
 
-    for(int i = 0; i < THREADS; ++i) pthread_create(&thr[i], NULL, &thread_main, (void*)i);
-    for(int i = 0; i < THREADS; ++i)
-    {
+    for(intptr_t i = 0; i < THREADS; ++i) {
+      pthread_create(&thr[i], NULL, &thread_main, (void*)i);
+    }
+    for(int i = 0; i < THREADS; ++i) {
         int totalSum = 0;
         pthread_join(thr[i], (void**)&totalSum);
         assert(totalSum == expectedTotalSum);

test/pthread/test_pthread_cancel_cond_wait.cpp

@@ -22,7 +22,7 @@ volatile int res = 43;
 
 static void cleanup_handler(void *arg) {
   emscripten_log(EM_LOG_CONSOLE, "Called clean-up handler with arg %p", arg);
-  int a = reinterpret_cast<int>(arg);
+  int a = reinterpret_cast<intptr_t>(arg);
   res -= a;
 
   pthread_mutex_unlock(&mutex);

test/pthread/test_pthread_create.cpp

@@ -46,20 +46,20 @@ void *ThreadMain(void *arg)
 			}
 		}
 	// Ensure all elements are in place.
-	int numGood = 0;
+	intptr_t numGood = 0;
 	for(unsigned int i = 0; i < N; ++i)
 		if (n[i] == i) ++numGood;
 		else emscripten_errf("n[%d]=%d", i, n[i]);
 
-	emscripten_outf("Thread idx %ld with param %d: all done with result %d.", idx, param, numGood);
+	emscripten_outf("Thread idx %ld with param %d: all done with result %ld.", idx, param, numGood);
 	pthread_exit((void*)numGood);
 }
 
 pthread_t thread[NUM_THREADS];
 
 int numThreadsToCreate = 1000;
 
-void CreateThread(int i)
+void CreateThread(intptr_t i)
 {
 	static int counter = 1;
 	global_shared_data[i] = (counter++ * 12141231) & 0x7FFFFFFF; // Arbitrary random'ish data for perturbing the sort for this thread task.
@@ -81,7 +81,7 @@ int main()
 		{
 			if (thread[i])
 			{
-				int status;
+				intptr_t status;
 				int rc = pthread_join(thread[i], (void**)&status);
 				assert(rc == 0);
 				emscripten_errf("Main: Joined thread idx %d (param %d) with status %d", i, global_shared_data[i], (int)status);

test/pthread/test_pthread_gcc_64bit_atomic_fetch_and_op.cpp

@@ -110,7 +110,7 @@ int main()
 				for(int i = 0; i < NUM_THREADS; ++i)
 				{
 					threadArg[i] = DUP(1 << i);
-					pthread_create(&thread[i], NULL, thread_fetch_and_or, (void*)&threadArg[i]);
+					pthread_create(&thread[i], NULL, thread_fetch_and_or, &threadArg[i]);
 				}
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);
 				assert(fetch_and_or_data == HILO(65536 + (1<<(NUM_THREADS+1))-1, (1<<(NUM_THREADS+1))-1));
@@ -129,7 +129,7 @@ int main()
 				fetch_and_and_data = HILO(65536 + (1<<(NUM_THREADS+1))-1, (1<<(NUM_THREADS+1))-1);
 				for(int i = 0; i < NUM_THREADS; ++i)
 				{
-					threadArg[i] = DUP(~(1UL<<i));
+					threadArg[i] = DUP(~(1u<<i));
 					pthread_create(&thread[i], NULL, thread_fetch_and_and, (void*)&threadArg[i]);
 				}
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);
@@ -149,7 +149,7 @@ int main()
 				fetch_and_xor_data = HILO(32768 + (1<<NUM_THREADS), 1<<NUM_THREADS);
 				for(int i = 0; i < NUM_THREADS; ++i)
 				{
-					threadArg[i] = DUP(~(1UL<<i));
+					threadArg[i] = DUP(~(1u<<i));
 					pthread_create(&thread[i], NULL, thread_fetch_and_xor, (void*)&threadArg[i]);
 				}
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);

test/pthread/test_pthread_gcc_64bit_atomic_op_and_fetch.cpp

@@ -129,7 +129,7 @@ int main()
 				and_and_fetch_data = HILO(65536 + (1<<(NUM_THREADS+1))-1, (1<<(NUM_THREADS+1))-1);
 				for(int i = 0; i < NUM_THREADS; ++i)
 				{
-					threadArg[i] = DUP(~(1UL<<i));
+					threadArg[i] = DUP(~(1U<<i));
 					pthread_create(&thread[i], NULL, thread_and_and_fetch, (void*)&threadArg[i]);
 				}
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);
@@ -149,7 +149,7 @@ int main()
 				xor_and_fetch_data = HILO(32768 + (1<<NUM_THREADS), 1<<NUM_THREADS);
 				for(int i = 0; i < NUM_THREADS; ++i)
 				{
-					threadArg[i] = DUP(~(1UL<<i));
+					threadArg[i] = DUP(~(1U<<i));
 					pthread_create(&thread[i], NULL, thread_xor_and_fetch, (void*)&threadArg[i]);
 				}
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);

test/pthread/test_pthread_gcc_atomic_fetch_and_op.cpp

@@ -103,7 +103,7 @@ int main()
 			fetch_and_or_data = (1<<NUM_THREADS);
 			if (emscripten_has_threading_support())
 			{
-				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_fetch_and_or, (void*)(1<<i));
+				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_fetch_and_or, (void*)(1ll<<i));
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);
 				assert(fetch_and_or_data == (1<<(NUM_THREADS+1))-1);
 			}
@@ -119,7 +119,7 @@ int main()
 			fetch_and_and_data = (1<<(NUM_THREADS+1))-1;
 			if (emscripten_has_threading_support())
 			{
-				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_fetch_and_and, (void*)(~(1<<i)));
+				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_fetch_and_and, (void*)(~(1ll<<i)));
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);
 				assert(fetch_and_and_data == 1<<NUM_THREADS);
 			}
@@ -135,7 +135,7 @@ int main()
 			fetch_and_xor_data = 1<<NUM_THREADS;
 			if (emscripten_has_threading_support())
 			{
-				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_fetch_and_xor, (void*)(~(1<<i)));
+				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_fetch_and_xor, (void*)(~(1ll<<i)));
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);
 				assert(fetch_and_xor_data == (1<<(NUM_THREADS+1))-1);
 			}

test/pthread/test_pthread_gcc_atomic_op_and_fetch.cpp

@@ -102,7 +102,7 @@ int main()
 			or_and_fetch_data = (1<<NUM_THREADS);
 			if (emscripten_has_threading_support())
 			{
-				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_or_and_fetch, (void*)(1<<i));
+				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_or_and_fetch, (void*)(1ll<<i));
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);
 				assert(or_and_fetch_data == (1<<(NUM_THREADS+1))-1);
 			}
@@ -118,7 +118,7 @@ int main()
 			and_and_fetch_data = (1<<(NUM_THREADS+1))-1;
 			if (emscripten_has_threading_support())
 			{
-				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_and_and_fetch, (void*)(~(1<<i)));
+				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_and_and_fetch, (void*)(~(1ll<<i)));
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);
 				assert(and_and_fetch_data == 1<<NUM_THREADS);
 			}
@@ -134,7 +134,7 @@ int main()
 			xor_and_fetch_data = 1<<NUM_THREADS;
 			if (emscripten_has_threading_support())
 			{
-				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_xor_and_fetch, (void*)(~(1<<i)));
+				for(int i = 0; i < NUM_THREADS; ++i) pthread_create(&thread[i], NULL, thread_xor_and_fetch, (void*)(~(1ll<<i)));
 				for(int i = 0; i < NUM_THREADS; ++i) pthread_join(thread[i], NULL);
 				assert(xor_and_fetch_data == (1<<(NUM_THREADS+1))-1);
 			}

test/pthread/test_pthread_join.cpp

@@ -40,8 +40,8 @@ int main()
   assert(EM_ASM_INT(return PThread.runningWorkers.length) == 0);
   assert(EM_ASM_INT(return PThread.unusedWorkers.length) == 8); // This test should be run with a prepopulated pool of size 8.
 
-  int n = 20;
-  emscripten_outf("Main: Spawning thread to compute fib(%d)...", n);
+  intptr_t n = 20;
+  emscripten_outf("Main: Spawning thread to compute fib(%ld)...", n);
   int s = pthread_create(&thr, NULL, thread_start, (void*)n);
   assert(s == 0);
   emscripten_out("Main: Waiting for thread to join");

test/pthread/test_pthread_malloc.cpp

@@ -40,7 +40,7 @@ static void *thread_start(void *arg)
 int main()
 {
   pthread_t thr[NUM_THREADS];
-  for(int i = 0; i < NUM_THREADS; ++i)
+  for(intptr_t i = 0; i < NUM_THREADS; ++i)
     pthread_create(&thr[i], NULL, thread_start, (void*)(i*N));
   int result = 0;
   for(int i = 0; i < NUM_THREADS; ++i) {

test/pthread/test_pthread_preallocates_workers.cpp

@@ -28,8 +28,8 @@ static void *thread_start(void *arg)
   pthread_exit((void*)0);
 }
 
-void CreateThread(int idx) {
-  emscripten_outf("Main: Spawning thread %d...", idx);
+void CreateThread(intptr_t idx) {
+  emscripten_outf("Main: Spawning thread %ld...", idx);
   int rc = pthread_create(&threads[idx], NULL, thread_start, (void*)idx);
   assert(rc == 0);
 }

test/test_browser.py

@@ -23,7 +23,7 @@
 
 from common import BrowserCore, RunnerCore, path_from_root, has_browser, EMTEST_BROWSER, Reporting
 from common import create_file, parameterized, ensure_dir, disabled, test_file, WEBIDL_BINDER
-from common import read_file, requires_v8, also_with_minimal_runtime, EMRUN
+from common import read_file, requires_v8, also_with_minimal_runtime, EMRUN, no_wasm64
 from tools import shared
 from tools import ports
 from tools import utils
@@ -119,6 +119,8 @@ def also_with_wasm2js(f):
   def metafunc(self, with_wasm2js):
     assert self.get_setting('WASM') is None
     if with_wasm2js:
+      if self.is_wasm64():
+        self.skipTest('wasm2js is not compatible with MEMORY64')
       self.set_setting('WASM', 0)
       f(self)
     else:
@@ -4108,15 +4110,15 @@ def test_pthread_custom_pthread_main_url(self):
 
     # Test that it is possible to define "Module.locateFile" string to locate where worker.js will be loaded from.
     create_file('shell.html', read_file(path_from_root('src/shell.html')).replace('var Module = {', 'var Module = { locateFile: function (path, prefix) {if (path.endsWith(".wasm")) {return prefix + path;} else {return "cdn/" + path;}}, '))
-    self.compile_btest(['main.cpp', '--shell-file', 'shell.html', '-sWASM=0', '-pthread', '-sPTHREAD_POOL_SIZE', '-o', 'test.html'], reporting=Reporting.JS_ONLY)
+    self.compile_btest(['main.cpp', '--shell-file', 'shell.html', '-pthread', '-sPTHREAD_POOL_SIZE', '-o', 'test.html'], reporting=Reporting.JS_ONLY)
     shutil.move('test.worker.js', Path('cdn/test.worker.js'))
     if os.path.exists('test.html.mem'):
       shutil.copyfile('test.html.mem', Path('cdn/test.html.mem'))
     self.run_browser('test.html', '/report_result?exit:0')
 
     # Test that it is possible to define "Module.locateFile(foo)" function to locate where worker.js will be loaded from.
     create_file('shell2.html', read_file(path_from_root('src/shell.html')).replace('var Module = {', 'var Module = { locateFile: function(filename) { if (filename == "test.worker.js") return "cdn/test.worker.js"; else return filename; }, '))
-    self.compile_btest(['main.cpp', '--shell-file', 'shell2.html', '-sWASM=0', '-pthread', '-sPTHREAD_POOL_SIZE', '-o', 'test2.html'], reporting=Reporting.JS_ONLY)
+    self.compile_btest(['main.cpp', '--shell-file', 'shell2.html', '-pthread', '-sPTHREAD_POOL_SIZE', '-o', 'test2.html'], reporting=Reporting.JS_ONLY)
     delete_file('test.worker.js')
     self.run_browser('test2.html', '/report_result?exit:0')
 
@@ -4187,6 +4189,8 @@ def test_pthread_global_data_initialization(self):
 
   @requires_threads
   def test_pthread_global_data_initialization_in_sync_compilation_mode(self):
+    if self.is_wasm64():
+      self.skipTest('wasm2js is not compatible with MEMORY64')
     mem_init_modes = [[], ['-sWASM=0', '--memory-init-file', '0'], ['-sWASM=0', '--memory-init-file', '1']]
     for mem_init_mode in mem_init_modes:
       print(mem_init_mode)
@@ -4230,6 +4234,7 @@ def test_pthread_safe_stack(self):
     # same stack size as the main thread normally would.
     self.btest('core/test_safe_stack.c', expected='abort:stack overflow', args=['-pthread', '-sPROXY_TO_PTHREAD', '-sSTACK_OVERFLOW_CHECK=2', '-sSTACK_SIZE=64KB'])
 
+  @no_wasm64('TODO: ASAN in memory64')
   @parameterized({
     'leak': ['test_pthread_lsan_leak', ['-gsource-map']],
     'no_leak': ['test_pthread_lsan_no_leak', []],
@@ -4239,6 +4244,7 @@ def test_pthread_safe_stack(self):
   def test_pthread_lsan(self, name, args):
     self.btest(Path('pthread', name + '.cpp'), expected='1', args=['-fsanitize=leak', '-sINITIAL_MEMORY=256MB', '-pthread', '-sPROXY_TO_PTHREAD', '--pre-js', test_file('pthread', name + '.js')] + args)
 
+  @no_wasm64('TODO: ASAN in memory64')
   @parameterized({
     # Reusing the LSan test files for ASan.
     'leak': ['test_pthread_lsan_leak', ['-gsource-map']],
@@ -4248,10 +4254,12 @@ def test_pthread_lsan(self, name, args):
   def test_pthread_asan(self, name, args):
     self.btest(Path('pthread', name + '.cpp'), expected='1', args=['-fsanitize=address', '-sINITIAL_MEMORY=256MB', '-pthread', '-sPROXY_TO_PTHREAD', '--pre-js', test_file('pthread', name + '.js')] + args)
 
+  @no_wasm64('TODO: ASAN in memory64')
   @requires_threads
   def test_pthread_asan_use_after_free(self):
     self.btest('pthread/test_pthread_asan_use_after_free.cpp', expected='1', args=['-fsanitize=address', '-sINITIAL_MEMORY=256MB', '-pthread', '-sPROXY_TO_PTHREAD', '--pre-js', test_file('pthread/test_pthread_asan_use_after_free.js')])
 
+  @no_wasm64('TODO: ASAN in memory64')
   @no_firefox('https://github.com/emscripten-core/emscripten/issues/20006')
   @also_with_wasmfs
   @requires_threads