Merge pull request #286 from gwsystems/spec-alignment

Spec alignment
gwsystems · Dec 5, 2021 · 6b037e3 · 6b037e3
2 parents b841889 + 5efee76
commit 6b037e3
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 63 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -101,7 +101,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./runtime/bin/gocr_wasm.so
-          key: ${{ runner.os }}-gocr2-${{ hashFiles('./runtime/tests/Makefile', './runtime/tests/gocr/**', './runtime/compiletime/**', './runtime/compiletime/memory/**') }}
+          key: ${{ runner.os }}-gocr2-${{ hashFiles('./runtime/tests/Makefile', './runtime/tests/gocr/**', './runtime/compiletime/**') }}
         if: success() || failure()
       - name: Hyde
         run: |
@@ -138,7 +138,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./runtime/bin/ekf_wasm.so
-          key: ${{ runner.os }}-gocr2-${{ hashFiles('./runtime/tests/Makefile', './runtime/tests/TinyEKF/**', './runtime/compiletime/**', './runtime/compiletime/memory/**') }}
+          key: ${{ runner.os }}-gocr2-${{ hashFiles('./runtime/tests/Makefile', './runtime/tests/TinyEKF/**', './runtime/compiletime/**') }}
         if: success() || failure()
       - name: EKF one iteration
         run: |

diff --git a/runtime/compiletime/README.md b/runtime/compiletime/README.md
@@ -0,0 +1,5 @@
+A WebAssembly module instance is statically linked with the backing functions implementing the wasm32 ABI, yielding a *.so file that SLEdge can execute. This ensures that the instance is able to aggressively inline and optimize this code.
+
+They are broken into instruction types as on https://webassembly.github.io/spec/core/exec/instructions.html. They depend on common headers for the WebAssembly types located in the WebAssembly instance struct. These are located in runtime/include/common.
+
+The stubs correspond to awsm/src/codegen/runtime_stubs.rs
diff --git a/runtime/compiletime/memory/64bit_nix.c → runtime/compiletime/memory_instructions.c b/runtime/compiletime/memory/64bit_nix.c → runtime/compiletime/memory_instructions.c
@@ -1,4 +1,5 @@
 #include <assert.h>
+
 #include "types.h"
 
 uint32_t
@@ -164,19 +165,3 @@ set_global_i64(uint32_t offset, int64_t v)
 {
 	set_i64(offset, v);
 }
-
-// Table handling functionality
-// INLINE char *
-// get_function_from_table(uint32_t idx, uint32_t type_id)
-// {
-// 	assert(idx < INDIRECT_TABLE_SIZE);
-
-// 	struct indirect_table_entry f = local_sandbox_context_cache.module_indirect_table[idx];
-
-// 	// FIXME: Commented out function type check because of gocr
-// 	// assert(f.type_id == type_id);
-
-// 	assert(f.func_pointer);
-
-// 	return f.func_pointer;
-// }
diff --git a/runtime/compiletime/instr.c → runtime/compiletime/numeric_instructions.c b/runtime/compiletime/instr.c → runtime/compiletime/numeric_instructions.c
diff --git a/runtime/compiletime/table_instructions.c b/runtime/compiletime/table_instructions.c
@@ -0,0 +1,42 @@
+#include <assert.h>
+
+#include "types.h"
+
+extern thread_local struct wasm_module_instance current_wasm_module_instance;
+
+INLINE void
+add_function_to_table(uint32_t idx, uint32_t type_id, char *pointer)
+{
+	assert(idx < INDIRECT_TABLE_SIZE);
+	assert(local_sandbox_context_cache.module_indirect_table != NULL);
+
+	/* TODO: atomic for multiple concurrent invocations? Issue #97 */
+	if (local_sandbox_context_cache.module_indirect_table[idx].type_id == type_id
+	    && local_sandbox_context_cache.module_indirect_table[idx].func_pointer == pointer)
+		return;
+
+	local_sandbox_context_cache.module_indirect_table[idx] = (struct indirect_table_entry){
+		.type_id = type_id, .func_pointer = pointer
+	};
+}
+
+INLINE char *
+get_function_from_table(uint32_t idx, uint32_t type_id)
+{
+#ifdef LOG_FUNCTION_TABLE
+	fprintf(stderr, "get_function_from_table(idx: %u, type_id: %u)\n", idx, type_id);
+	fprintf(stderr, "indirect_table_size: %u\n", INDIRECT_TABLE_SIZE);
+#endif
+	assert(idx < INDIRECT_TABLE_SIZE);
+
+	struct indirect_table_entry f = local_sandbox_context_cache.module_indirect_table[idx];
+#ifdef LOG_FUNCTION_TABLE
+	fprintf(stderr, "assumed type: %u, type in table: %u\n", type_id, f.type_id);
+#endif
+	// FIXME: Commented out function type check because of gocr
+	// assert(f.type_id == type_id);
+
+	assert(f.func_pointer != NULL);
+
+	return f.func_pointer;
+}
diff --git a/runtime/src/memory/64bit_nix.c b/runtime/src/memory/64bit_nix.c
@@ -88,31 +88,3 @@ instruction_memory_grow(uint32_t count)
 
 	return rc;
 }
-
-/*
- * Table handling functionality
- * This was moved from compiletime in order to place the
- * function in the callstack in GDB. It can be moved back
- * to runtime/compiletime/memory/64bit_nix.c to remove the
- * additional function call
- */
-char *
-get_function_from_table(uint32_t idx, uint32_t type_id)
-{
-#ifdef LOG_FUNCTION_TABLE
-	fprintf(stderr, "get_function_from_table(idx: %u, type_id: %u)\n", idx, type_id);
-	fprintf(stderr, "indirect_table_size: %u\n", INDIRECT_TABLE_SIZE);
-#endif
-	assert(idx < INDIRECT_TABLE_SIZE);
-
-	struct indirect_table_entry f = local_sandbox_context_cache.module_indirect_table[idx];
-#ifdef LOG_FUNCTION_TABLE
-	fprintf(stderr, "assumed type: %u, type in table: %u\n", type_id, f.type_id);
-#endif
-	// FIXME: Commented out function type check because of gocr
-	// assert(f.type_id == type_id);
-
-	assert(f.func_pointer != NULL);
-
-	return f.func_pointer;
-}
diff --git a/runtime/src/memory/common.c b/runtime/src/memory/common.c
@@ -14,22 +14,6 @@ initialize_region(uint32_t offset, uint32_t data_count, char *data)
 	memcpy(get_memory_ptr_for_runtime(offset, data_count), data, data_count);
 }
 
-void
-add_function_to_table(uint32_t idx, uint32_t type_id, char *pointer)
-{
-	assert(idx < INDIRECT_TABLE_SIZE);
-	assert(local_sandbox_context_cache.module_indirect_table != NULL);
-
-	/* TODO: atomic for multiple concurrent invocations? Issue #97 */
-	if (local_sandbox_context_cache.module_indirect_table[idx].type_id == type_id
-	    && local_sandbox_context_cache.module_indirect_table[idx].func_pointer == pointer)
-		return;
-
-	local_sandbox_context_cache.module_indirect_table[idx] = (struct indirect_table_entry){
-		.type_id = type_id, .func_pointer = pointer
-	};
-}
-
 /* If we are using runtime globals, we need to populate them */
 WEAK void
 populate_globals()

diff --git a/runtime/tests/Makefile b/runtime/tests/Makefile
@@ -7,7 +7,7 @@ OPTFLAGS=-O3 -flto
 SLEDGE_BASE_DIR=../../
 SLEDGE_RT_DIR=${SLEDGE_BASE_DIR}/runtime/
 SLEDGE_COMPILETIME_INC=${SLEDGE_RT_DIR}/include
-SLEDGE_COMPILETIME_SRC=${SLEDGE_RT_DIR}/compiletime/instr.c ${SLEDGE_RT_DIR}/compiletime/memory/64bit_nix.c
+SLEDGE_COMPILETIME_SRC=${SLEDGE_RT_DIR}/compiletime/*.c
 
 ALL=fibonacci empty ekf cifar10 gocr lpd resize
 ALL_COPY_DEST=$(ALL:%=../../runtime/bin/%_wasm.so)