Skip to content

Fix core_2gb.test_memprof_requirements #25807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −22
Open

Fix core_2gb.test_memprof_requirements #25807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/codesize/test_codesize_hello_O0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 24194,
"a.out.js.gz": 8694,
"a.out.js.gz": 8693,
"a.out.nodebug.wasm": 15144,
"a.out.nodebug.wasm.gz": 7460,
"total": 39338,
"total_gz": 16154,
"total_gz": 16153,
"sent": [
"fd_write"
],
Expand Down
22 changes: 11 additions & 11 deletions test/codesize/test_codesize_minimal_O0.expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,28 +1329,28 @@ var wasmMemory = makeInvalidEarlyAccess('wasmMemory');

function assignWasmExports(wasmExports) {
assert(typeof wasmExports['add'] != 'undefined', 'missing Wasm export: add');
_add = Module['_add'] = createExportWrapper('add', 2);
assert(typeof wasmExports['fflush'] != 'undefined', 'missing Wasm export: fflush');
_fflush = createExportWrapper('fflush', 1);
assert(typeof wasmExports['emscripten_stack_init'] != 'undefined', 'missing Wasm export: emscripten_stack_init');
_emscripten_stack_init = wasmExports['emscripten_stack_init'];
assert(typeof wasmExports['emscripten_stack_get_free'] != 'undefined', 'missing Wasm export: emscripten_stack_get_free');
_emscripten_stack_get_free = wasmExports['emscripten_stack_get_free'];
assert(typeof wasmExports['emscripten_stack_get_base'] != 'undefined', 'missing Wasm export: emscripten_stack_get_base');
_emscripten_stack_get_base = wasmExports['emscripten_stack_get_base'];
assert(typeof wasmExports['emscripten_stack_get_end'] != 'undefined', 'missing Wasm export: emscripten_stack_get_end');
_emscripten_stack_get_end = wasmExports['emscripten_stack_get_end'];
assert(typeof wasmExports['_emscripten_stack_restore'] != 'undefined', 'missing Wasm export: _emscripten_stack_restore');
__emscripten_stack_restore = wasmExports['_emscripten_stack_restore'];
assert(typeof wasmExports['_emscripten_stack_alloc'] != 'undefined', 'missing Wasm export: _emscripten_stack_alloc');
__emscripten_stack_alloc = wasmExports['_emscripten_stack_alloc'];
assert(typeof wasmExports['emscripten_stack_get_current'] != 'undefined', 'missing Wasm export: emscripten_stack_get_current');
_emscripten_stack_get_current = wasmExports['emscripten_stack_get_current'];
assert(typeof wasmExports['memory'] != 'undefined', 'missing Wasm export: memory');
memory = wasmMemory = wasmExports['memory'];
assert(typeof wasmExports['global_val'] != 'undefined', 'missing Wasm export: global_val');
_global_val = Module['_global_val'] = wasmExports['global_val'].value;
assert(typeof wasmExports['__indirect_function_table'] != 'undefined', 'missing Wasm export: __indirect_function_table');
_add = Module['_add'] = createExportWrapper('add', 2);
_fflush = createExportWrapper('fflush', 1);
_emscripten_stack_init = wasmExports['emscripten_stack_init'];
_emscripten_stack_get_free = wasmExports['emscripten_stack_get_free'];
_emscripten_stack_get_base = wasmExports['emscripten_stack_get_base'];
_emscripten_stack_get_end = wasmExports['emscripten_stack_get_end'];
__emscripten_stack_restore = wasmExports['_emscripten_stack_restore'];
__emscripten_stack_alloc = wasmExports['_emscripten_stack_alloc'];
_emscripten_stack_get_current = wasmExports['emscripten_stack_get_current'];
memory = wasmMemory = wasmExports['memory'];
_global_val = Module['_global_val'] = wasmExports['global_val'].value;
__indirect_function_table = wasmExports['__indirect_function_table'];
}

Expand Down
4 changes: 2 additions & 2 deletions test/codesize/test_codesize_minimal_O0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"a.out.js": 19489,
"a.out.js.gz": 7016,
"a.out.js.gz": 7012,
"a.out.nodebug.wasm": 1136,
"a.out.nodebug.wasm.gz": 659,
"total": 20625,
"total_gz": 7675,
"total_gz": 7671,
"sent": [],
"imports": [],
"exports": [
Expand Down
6 changes: 3 additions & 3 deletions test/codesize/test_unoptimized_code_size.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"hello_world.js": 56928,
"hello_world.js.gz": 17700,
"hello_world.js.gz": 17707,
"hello_world.wasm": 15144,
"hello_world.wasm.gz": 7460,
"no_asserts.js": 26632,
"no_asserts.js.gz": 8884,
"no_asserts.wasm": 12193,
"no_asserts.wasm.gz": 5990,
"strict.js": 54943,
"strict.js.gz": 17045,
"strict.js.gz": 17053,
"strict.wasm": 15144,
"strict.wasm.gz": 7455,
"total": 180984,
"total_gz": 64534
"total_gz": 64549
}
6 changes: 4 additions & 2 deletions test/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4626,10 +4626,12 @@ def test_dylink_global_var_export(self):
int main(void) {
void* js_address = EM_ASM_PTR({
console.log("JS:_my_number:", _my_number, HEAP32[_my_number/4]);
var value = HEAP32[_my_number/4];
console.log("JS:_my_number:", _my_number, value);
assert(value == 123456, value);
return _my_number;
});
printf("C: my_number: %ld %d\n", (long)&my_number, my_number);
printf("C: my_number: %lu %d\n", (uintptr_t)&my_number, my_number);
assert(js_address == &my_number);
return 0;
}
Expand Down
7 changes: 5 additions & 2 deletions tools/emscripten.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,9 @@ def create_receiving(function_exports, other_exports, library_symbols, aliases):

do_module_exports = (settings.MODULARIZE or not settings.MINIMAL_RUNTIME) and settings.MODULARIZE != 'instance'
receiving.append('\nfunction assignWasmExports(wasmExports) {')
if settings.ASSERTIONS:
for sym in exports:
receiving.append(f" assert(typeof wasmExports['{sym}'] != 'undefined', 'missing Wasm export: {sym}');")
for sym, info in exports.items():
is_function = type(info) == webassembly.FuncType
mangled = asmjs_mangle(sym)
Expand All @@ -966,8 +969,6 @@ def create_receiving(function_exports, other_exports, library_symbols, aliases):
assignment += f" = dynCalls['{sig_str}']"
if do_module_exports and should_export(mangled):
assignment += f" = Module['{mangled}']"
if settings.ASSERTIONS:
receiving.append(f" assert(typeof wasmExports['{sym}'] != 'undefined', 'missing Wasm export: {sym}');")
if sym in alias_inverse_map:
for target in alias_inverse_map[sym]:
assignment += f" = {target}"
Expand All @@ -983,6 +984,8 @@ def create_receiving(function_exports, other_exports, library_symbols, aliases):
value = f"wasmExports['{sym}'].value"
if settings.MEMORY64:
value = f'Number({value})'
elif settings.CAN_ADDRESS_2GB:
value = f'({value}) >>> 0'
receiving.append(f" {assignment} = {value};")
else:
receiving.append(f" {assignment} = wasmExports['{sym}'];")
Expand Down