Move emscripten_get_heap_size to native code

sbc100 · sbc100 · commit 820a8a610df7 · 2021-03-18T10:23:01.000-07:00
diff --git a/src/library.js b/src/library.js
@@ -437,10 +437,6 @@ LibraryManager.library = {
     return -1;
   },
 
-  emscripten_get_heap_size: function() {
-    return HEAPU8.length;
-  },
-
 #if ABORTING_MALLOC
   $abortOnCannotGrowMemory: function(requestedSize) {
 #if ASSERTIONS
@@ -487,7 +483,7 @@ LibraryManager.library = {
   },
 #endif // ~TEST_MEMORY_GROWTH_FAILS
 
-  emscripten_resize_heap__deps: ['emscripten_get_heap_size'
+  __emscripten_resize_heap__deps: [
 #if ASSERTIONS == 2
   , 'emscripten_get_now'
 #endif
@@ -498,7 +494,7 @@ LibraryManager.library = {
   , '$emscripten_realloc_buffer'
 #endif
   ],
-  emscripten_resize_heap: function(requestedSize) {
+  __emscripten_resize_heap: function(oldSize, requestedSize) {
 #if CAN_ADDRESS_2GB
     requestedSize = requestedSize >>> 0;
 #endif
@@ -509,7 +505,6 @@ LibraryManager.library = {
     return false; // malloc will report failure
 #endif // ABORTING_MALLOC
 #else // ALLOW_MEMORY_GROWTH == 0
-    var oldSize = _emscripten_get_heap_size();
     // With pthreads, races can happen (another thread might increase the size in between), so return a failure, and let the caller retry.
 #if USE_PTHREADS
     if (requestedSize <= oldSize) {
diff --git a/system/include/emscripten/heap.h b/system/include/emscripten/heap.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
 #include <emscripten/emscripten.h>
 
 #define WASM_PAGE_SIZE 65536
diff --git a/system/lib/libc/emscripten_get_heap_size.c b/system/lib/libc/emscripten_get_heap_size.c
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2021 The Emscripten Authors.  All rights reserved.
+ * Emscripten is available under two separate licenses, the MIT license and the
+ * University of Illinois/NCSA Open Source License.  Both these licenses can be
+ * found in the LICENSE file.
+ */
+
+#include <emscripten/heap.h>
+
+size_t emscripten_get_heap_size() {
+  return __builtin_wasm_memory_size(0) * WASM_PAGE_SIZE;
+}
diff --git a/system/lib/libc/emscripten_resize_heap.c b/system/lib/libc/emscripten_resize_heap.c
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 The Emscripten Authors.  All rights reserved.
+ * Emscripten is available under two separate licenses, the MIT license and the
+ * University of Illinois/NCSA Open Source License.  Both these licenses can be
+ * found in the LICENSE file.
+ */
+
+#include <emscripten/heap.h>
+
+int __emscripten_resize_heap(size_t requested_size, size_t current_size) EM_IMPORT(__emscripten_resize_heap);
+
+// This is just a small wrapper the JavaScript function `__emscripten_resize_heap`.
+// We pass in the current size to avoid reverse dependency on
+// 'emscripten_get_heap_size`
+int emscripten_resize_heap(size_t requested_size) {
+  return __emscripten_resize_heap(emscripten_get_heap_size(), requested_size);
+}
diff --git a/system/lib/standalone/standalone.c b/system/lib/standalone/standalone.c
@@ -117,9 +117,8 @@ void *emscripten_memcpy_big(void *restrict dest, const void *restrict src, size_
 
 extern void emscripten_notify_memory_growth(size_t memory_index);
 
-int emscripten_resize_heap(size_t size) {
+int emscripten_resize_heap_internal(size_t size, size_t old_size) {
 #ifdef __EMSCRIPTEN_MEMORY_GROWTH__
-  size_t old_size = __builtin_wasm_memory_size(0) * WASM_PAGE_SIZE;
   assert(old_size < size);
   ssize_t diff = (size - old_size + WASM_PAGE_SIZE - 1) / WASM_PAGE_SIZE;
   size_t result = __builtin_wasm_memory_grow(0, diff);
diff --git a/tests/other/metadce/hello_libcxx_O2.imports b/tests/other/metadce/hello_libcxx_O2.imports
@@ -1,6 +1,6 @@
+env.__emscripten_resize_heap
 env.abort
 env.emscripten_memcpy_big
-env.emscripten_resize_heap
 env.setTempRet0
 env.strftime_l
 wasi_snapshot_preview1.environ_get
diff --git a/tests/other/metadce/hello_libcxx_O2.sent b/tests/other/metadce/hello_libcxx_O2.sent
@@ -1,7 +1,7 @@
 __cxa_atexit
+__emscripten_resize_heap
 abort
 emscripten_memcpy_big
-emscripten_resize_heap
 environ_get
 environ_sizes_get
 fd_close
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions.imports b/tests/other/metadce/hello_libcxx_O2_fexceptions.imports
@@ -7,10 +7,10 @@ env.__cxa_free_exception
 env.__cxa_rethrow
 env.__cxa_throw
 env.__cxa_uncaught_exceptions
+env.__emscripten_resize_heap
 env.__resumeException
 env.abort
 env.emscripten_memcpy_big
-env.emscripten_resize_heap
 env.getTempRet0
 env.invoke_diii
 env.invoke_fiii
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions.sent b/tests/other/metadce/hello_libcxx_O2_fexceptions.sent
@@ -8,10 +8,10 @@ __cxa_free_exception
 __cxa_rethrow
 __cxa_throw
 __cxa_uncaught_exceptions
+__emscripten_resize_heap
 __resumeException
 abort
 emscripten_memcpy_big
-emscripten_resize_heap
 environ_get
 environ_sizes_get
 fd_close
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.imports b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.imports
@@ -7,10 +7,10 @@ env.__cxa_free_exception
 env.__cxa_rethrow
 env.__cxa_throw
 env.__cxa_uncaught_exceptions
+env.__emscripten_resize_heap
 env.__resumeException
 env.abort
 env.emscripten_memcpy_big
-env.emscripten_resize_heap
 env.getTempRet0
 env.invoke_diii
 env.invoke_fiii
diff --git a/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.sent b/tests/other/metadce/hello_libcxx_O2_fexceptions_DEMANGLE_SUPPORT.sent
@@ -8,10 +8,10 @@ __cxa_free_exception
 __cxa_rethrow
 __cxa_throw
 __cxa_uncaught_exceptions
+__emscripten_resize_heap
 __resumeException
 abort
 emscripten_memcpy_big
-emscripten_resize_heap
 environ_get
 environ_sizes_get
 fd_close
diff --git a/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.imports b/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.imports
@@ -1,10 +1,10 @@
 GOT.mem.__heap_base
+env.__emscripten_resize_heap
 env.__indirect_function_table
 env.__memory_base
 env.__stack_pointer
 env.__table_base
 env.emscripten_memcpy_big
-env.emscripten_resize_heap
 env.memory
 env.setTempRet0
 wasi_snapshot_preview1.fd_write
diff --git a/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.sent b/tests/other/metadce/hello_world_O3_MAIN_MODULE_2.sent
@@ -1,9 +1,9 @@
+__emscripten_resize_heap
 __indirect_function_table
 __memory_base
 __stack_pointer
 __table_base
 emscripten_memcpy_big
-emscripten_resize_heap
 fd_write
 memory
 setTempRet0
diff --git a/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.funcs b/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.funcs
@@ -2,5 +2,4 @@ $__main_void
 $__wasm_call_ctors
 $_start
 $dlmalloc
-$emscripten_resize_heap
 $sbrk
diff --git a/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.imports b/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.imports
@@ -1,4 +1,4 @@
-env.emscripten_notify_memory_growth
+env.__emscripten_resize_heap
 wasi_snapshot_preview1.args_get
 wasi_snapshot_preview1.args_sizes_get
 wasi_snapshot_preview1.proc_exit
diff --git a/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.sent b/tests/other/metadce/mem_O3_ALLOW_MEMORY_GROWTH_STANDALONE_WASM.sent
@@ -1,4 +1,4 @@
+__emscripten_resize_heap
 args_get
 args_sizes_get
-emscripten_notify_memory_growth
 proc_exit
diff --git a/tests/other/metadce/mem_O3_STANDALONE_WASM.imports b/tests/other/metadce/mem_O3_STANDALONE_WASM.imports
@@ -1,3 +1,4 @@
+env.__emscripten_resize_heap
 wasi_snapshot_preview1.args_get
 wasi_snapshot_preview1.args_sizes_get
 wasi_snapshot_preview1.proc_exit
diff --git a/tests/other/metadce/mem_O3_STANDALONE_WASM.sent b/tests/other/metadce/mem_O3_STANDALONE_WASM.sent
@@ -1,3 +1,4 @@
+__emscripten_resize_heap
 args_get
 args_sizes_get
 proc_exit
diff --git a/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM.imports b/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM.imports
@@ -1 +1,2 @@
+env.__emscripten_resize_heap
 wasi_snapshot_preview1.proc_exit
diff --git a/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM.sent b/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM.sent
@@ -1 +1,2 @@
+__emscripten_resize_heap
 proc_exit
diff --git a/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM_flto.funcs b/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM_flto.funcs
@@ -1,3 +1,4 @@
 $__wasm_call_ctors
 $_start
 $dlmalloc
+$emscripten_resize_heap
diff --git a/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM_flto.imports b/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM_flto.imports
@@ -1 +1,2 @@
+env.__emscripten_resize_heap
 wasi_snapshot_preview1.proc_exit
diff --git a/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM_flto.sent b/tests/other/metadce/mem_no_argv_O3_STANDALONE_WASM_flto.sent
@@ -1 +1,2 @@
+__emscripten_resize_heap
 proc_exit
diff --git a/tests/other/metadce/mem_no_main_O3_STANDALONE_WASM_noentry.imports b/tests/other/metadce/mem_no_main_O3_STANDALONE_WASM_noentry.imports
@@ -1 +1 @@
-
+env.__emscripten_resize_heap
diff --git a/tests/other/metadce/mem_no_main_O3_STANDALONE_WASM_noentry.sent b/tests/other/metadce/mem_no_main_O3_STANDALONE_WASM_noentry.sent
@@ -1 +1 @@
-
+__emscripten_resize_heap
diff --git a/tests/other/test_split_main_module.out b/tests/other/test_split_main_module.out
@@ -1,3 +1,3 @@
-wrote profile of 232 bytes (allocated 232 bytes)
+wrote profile of 240 bytes (allocated 240 bytes)
 Hello from main!
 Hello from lib!
diff --git a/tests/other/test_split_module.out b/tests/other/test_split_module.out
@@ -1,2 +1,2 @@
-wrote profile of 224 bytes (allocated 224 bytes)
+wrote profile of 232 bytes (allocated 232 bytes)
 Hello! answer: 42
diff --git a/tests/test_other.py b/tests/test_other.py
@@ -9981,6 +9981,7 @@ def test_split_module(self):
     self.assertNotIn('profile', result)
     self.assertIn('Hello! answer: 42', result)
 
+  @disabled('https://github.com/WebAssembly/binaryen/issues/3701')
   def test_split_main_module(self):
     initialTableSize = 16
 
diff --git a/tools/system_libs.py b/tools/system_libs.py
@@ -736,7 +736,13 @@ def get_files(self):
 
     libc_files += files_in_path(
         path_components=['system', 'lib', 'libc'],
-        filenames=['extras.c', 'wasi-helpers.c', 'emscripten_pthread.c'])
+        filenames=[
+          'extras.c',
+          'wasi-helpers.c',
+          'emscripten_pthread.c',
+          'emscripten_get_heap_size.c',
+          'emscripten_resize_heap.c',
+        ])
 
     libc_files += files_in_path(
         path_components=['system', 'lib', 'pthread'],

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+env.__emscripten_resize_heap`
`1`	`2`	`wasi_snapshot_preview1.proc_exit`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+__emscripten_resize_heap`
`1`	`2`	`proc_exit`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-wrote profile of 224 bytes (allocated 224 bytes)`
	`1`	`+wrote profile of 232 bytes (allocated 232 bytes)`
`2`	`2`	`Hello! answer: 42`