[wasm64] Fix and run run all pthread browser tests

Author: sbc100

.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);