Add pthread+memgrowth tests to test_other.py. NFC (#24682)

Previously these tests were only being run in the browser.

This is in preparation for fixing #24287.

Author: sbc100

test/pthread/test_pthread_memory_growth.c

@@ -38,8 +38,7 @@ EM_JS(void, js_assert_final_heap_state, (bool isWorker, const char* buffer, int
 
 #define FINAL_HEAP_SIZE (64 * 1024 * 1024)
 
-static char *alloc_beyond_initial_heap()
-{
+char *alloc_beyond_initial_heap() {
   char *buffer = malloc(FINAL_HEAP_SIZE);
   assert(buffer);
   // Write value at the end of the buffer to check that any thread can access addresses beyond the initial heap size.
@@ -50,24 +49,21 @@ static char *alloc_beyond_initial_heap()
 
 const char *_Atomic buffer = NULL;
 
-static void assert_final_heap_state(bool is_worker)
-{
+void assert_final_heap_state(bool is_worker) {
   assert(buffer != NULL);
   assert(*buffer == 42);
   js_assert_final_heap_state(is_worker, buffer, FINAL_HEAP_SIZE);
 }
 
-static void *thread_start(void *arg)
-{
+void *thread_start(void *arg) {
   assert_initial_heap_state(true);
   // allocate more memory than we currently have, forcing a growth
   buffer = alloc_beyond_initial_heap();
   assert_final_heap_state(true);
   return NULL;
 }
 
-int main()
-{
+int main() {
   assert_initial_heap_state(false);
 
   pthread_t thr;

test/pthread/test_pthread_memory_growth_mainthread.c

@@ -44,25 +44,22 @@ _Atomic enum state {
 
 const char *_Atomic buffer;
 
-static void assert_initial_heap_state(bool is_worker)
-{
+void assert_initial_heap_state(bool is_worker) {
   assert(state == INITIAL_STATE);
   assert(buffer == NULL);
   js_assert_initial_heap_state(is_worker);
 }
 
 #define FINAL_HEAP_SIZE (64 * 1024 * 1024)
 
-static void assert_final_heap_state(bool is_worker)
-{
+void assert_final_heap_state(bool is_worker) {
   assert(state == FINAL_STATE);
   assert(buffer != NULL);
   assert(*buffer == 42);
   js_assert_final_heap_state(is_worker, buffer, FINAL_HEAP_SIZE);
 }
 
-static void *thread_start(void *arg)
-{
+void *thread_start(void *arg) {
   assert_initial_heap_state(true);
   // Tell main thread that we checked the initial state and it can allocate.
   state = THREAD_CHECKED_INITIAL_STATE;
@@ -73,8 +70,7 @@ static void *thread_start(void *arg)
   return NULL;
 }
 
-static char *alloc_beyond_initial_heap()
-{
+char *alloc_beyond_initial_heap() {
   char *buffer = malloc(FINAL_HEAP_SIZE);
   assert(buffer);
   // Write value at the end of the buffer to check that any thread can access addresses beyond the initial heap size.
@@ -83,13 +79,13 @@ static char *alloc_beyond_initial_heap()
   return buffer;
 }
 
-int main()
-{
+int main() {
+  // Check initial state in both threads before allocating more memory.
+  assert_initial_heap_state(false);
+
   pthread_t thr;
   int res = pthread_create(&thr, NULL, thread_start, NULL);
   assert(res == 0);
-  // Check initial state in both threads before allocating more memory.
-  assert_initial_heap_state(false);
   while (state != THREAD_CHECKED_INITIAL_STATE);
 
   // allocate more memory than we currently have, forcing a growth

test/test_browser.py

@@ -4739,7 +4739,7 @@ def test_minimal_runtime_hello_thread(self, opts):
   # Tests memory growth in pthreads mode, but still on the main thread.
   @parameterized({
     '': ([], 1),
-    'proxy': (['-sPROXY_TO_PTHREAD'], 2),
+    'proxy': (['-sPROXY_TO_PTHREAD', '-sEXIT_RUNTIME'], 2),
   })
   @no_2gb('uses INITIAL_MEMORY')
   @no_4gb('uses INITIAL_MEMORY')

test/test_other.py

@@ -14281,6 +14281,28 @@ def test_pthread_trap(self):
   def test_pthread_kill(self):
     self.do_run_in_out_file_test('pthread/test_pthread_kill.c')
 
+  # Tests memory growth in pthreads mode, but still on the main thread.
+  @node_pthreads
+  @parameterized({
+    '': ([], 1),
+    'proxy': (['-sPROXY_TO_PTHREAD', '-sEXIT_RUNTIME'], 2),
+  })
+  def test_pthread_growth_mainthread(self, cflags, pthread_pool_size):
+    self.set_setting('PTHREAD_POOL_SIZE', pthread_pool_size)
+    self.do_runf('pthread/test_pthread_memory_growth_mainthread.c', cflags=['-Wno-pthreads-mem-growth', '-pthread', '-sALLOW_MEMORY_GROWTH', '-sINITIAL_MEMORY=32MB', '-sMAXIMUM_MEMORY=256MB'] + cflags)
+
+  # Tests memory growth in a pthread.
+  @node_pthreads
+  @parameterized({
+    '': ([],),
+    'assert': (['-sASSERTIONS'],),
+    'proxy': (['-sPROXY_TO_PTHREAD', '-sEXIT_RUNTIME'], 2),
+    'minimal': (['-sMINIMAL_RUNTIME', '-sMODULARIZE', '-sEXPORT_NAME=MyModule'],),
+  })
+  def test_pthread_growth(self, cflags, pthread_pool_size = 1):
+    self.set_setting('PTHREAD_POOL_SIZE', pthread_pool_size)
+    self.do_runf('pthread/test_pthread_memory_growth.c', cflags=['-Wno-pthreads-mem-growth', '-pthread', '-sALLOW_MEMORY_GROWTH', '-sINITIAL_MEMORY=32MB', '-sMAXIMUM_MEMORY=256MB'] + cflags)
+
   @node_pthreads
   def test_emscripten_set_interval(self):
     self.do_runf('emscripten_set_interval.c', args=['-pthread', '-sPROXY_TO_PTHREAD'])