From 20bc6cee86d6953c57581ce08be52e73148dca6b Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Mon, 14 Feb 2022 19:30:36 -0500 Subject: [PATCH 1/4] test: assemblyscript fib --- applications/Makefile | 3 +++ applications/wasm_apps | 2 +- tests/fibonacci/bimodal/spec.json | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/applications/Makefile b/applications/Makefile index 204ebfc..af4d660 100644 --- a/applications/Makefile +++ b/applications/Makefile @@ -65,6 +65,9 @@ exit.install: ../runtime/bin/exit.wasm.so .PHONY: fibonacci.install fibonacci.install: ../runtime/bin/fibonacci.wasm.so +.PHONY: asc-fib.install +asc-fib.install: ../runtime/bin/asc-fib.wasm.so + .PHONY: gocr.install gocr.install: ../runtime/bin/gocr.wasm.so diff --git a/applications/wasm_apps b/applications/wasm_apps index 1125852..7f1ab76 160000 --- a/applications/wasm_apps +++ b/applications/wasm_apps @@ -1 +1 @@ -Subproject commit 1125852cf199a53bf194f53da880aca97b64c124 +Subproject commit 7f1ab7608197dc8b80de959fd95ab19b7deb7b59 diff --git a/tests/fibonacci/bimodal/spec.json b/tests/fibonacci/bimodal/spec.json index 3d8be61..2355da8 100644 --- a/tests/fibonacci/bimodal/spec.json +++ b/tests/fibonacci/bimodal/spec.json @@ -1,7 +1,7 @@ [ { "name": "fibonacci_10", - "path": "fibonacci.wasm.so", + "path": "asc-fib.wasm.so", "port": 10010, "expected-execution-us": 6000, "admissions-percentile": 70, @@ -12,7 +12,7 @@ }, { "name": "fibonacci_40", - "path": "fibonacci.wasm.so", + "path": "asc-fib.wasm.so", "port": 10040, "expected-execution-us": 10000000, "admissions-percentile": 70, From 1cb220f3482369d8966392bfa5dcabd81f7799be Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Tue, 15 Feb 2022 13:11:35 -0500 Subject: [PATCH 2/4] fix: Correct globals bugs --- runtime/src/current_sandbox.c | 4 +++- runtime/src/sandbox.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/src/current_sandbox.c b/runtime/src/current_sandbox.c index 879720e..5fe08c4 100644 --- a/runtime/src/current_sandbox.c +++ b/runtime/src/current_sandbox.c @@ -104,7 +104,6 @@ current_sandbox_init() /* Initialize sandbox memory */ struct module *current_module = sandbox_get_module(sandbox); - module_initialize_globals(current_module); module_initialize_memory(current_module); /* Initialize WASI */ @@ -118,6 +117,9 @@ current_sandbox_init() sandbox_return(sandbox); + /* Initialize sandbox globals. Needs to run in user state */ + module_initialize_globals(current_module); + return sandbox; err: diff --git a/runtime/src/sandbox.c b/runtime/src/sandbox.c index bba061f..3b41e74 100644 --- a/runtime/src/sandbox.c +++ b/runtime/src/sandbox.c @@ -59,7 +59,7 @@ sandbox_allocate_globals(struct sandbox *sandbox) assert(sandbox); assert(sandbox->module); - return wasm_globals_init(&sandbox->globals, 10); + return wasm_globals_init(&sandbox->globals, 50); } static inline void From f10ccd827e683a96a47de2efc205f940f803892c Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Tue, 15 Feb 2022 13:11:48 -0500 Subject: [PATCH 3/4] chore: Update wasm_apps --- applications/wasm_apps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/wasm_apps b/applications/wasm_apps index 7f1ab76..f2090dd 160000 --- a/applications/wasm_apps +++ b/applications/wasm_apps @@ -1 +1 @@ -Subproject commit 7f1ab7608197dc8b80de959fd95ab19b7deb7b59 +Subproject commit f2090dd25e44c77fdba1b9cc95a3a920aecb122a From a5c8374b518ef0994ff5adae13f60c928d76b336 Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Tue, 15 Feb 2022 14:28:55 -0500 Subject: [PATCH 4/4] test: restore C fib --- tests/fibonacci/bimodal/spec.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fibonacci/bimodal/spec.json b/tests/fibonacci/bimodal/spec.json index 2355da8..733eaa9 100644 --- a/tests/fibonacci/bimodal/spec.json +++ b/tests/fibonacci/bimodal/spec.json @@ -1,7 +1,7 @@ [ { "name": "fibonacci_10", - "path": "asc-fib.wasm.so", + "path": "fibonacci.wasm.so", "port": 10010, "expected-execution-us": 6000, "admissions-percentile": 70, @@ -12,7 +12,7 @@ }, { "name": "fibonacci_40", - "path": "asc-fib.wasm.so", + "path": "fibonacci.wasm.so", "port": 10040, "expected-execution-us": 10000000, "admissions-percentile": 70, @@ -21,4 +21,4 @@ "http-resp-size": 1024, "http-resp-content-type": "text/plain" } -] +] \ No newline at end of file