adjust simde path; add wasm2c base

Author: jakegoldm

.vscode/c_cpp_properties.json

@@ -0,0 +1,18 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/opt/wasm2c_sandbox_compiler/wasm2c",
+                "/opt/simde"
+            ],
+            "defines": [],
+            "compilerPath": "/opt/wasi-sdk/wasi-sdk-14.0/bin/clang",
+            "cStandard": "c17",
+            "cppStandard": "c++14",
+            "intelliSenseMode": "linux-clang-x64"
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -7,6 +7,8 @@
         "pngpriv.h": "c",
         "mmintrin.h": "c",
         "time.h": "c",
-        "timer_t.h": "c"
-    }
+        "timer_t.h": "c",
+        "math.h": "c"
+    },
+    "cmake.configureOnOpen": false
 }

README.md

@@ -20,7 +20,7 @@ The `wamr_decode.sh` script compiles a `decode.c` file to WebAssembly. Then, usi
 decode.c -> decode.wasm -> decode.aot
 ```
 
-The `wasm2c_decode.sh` script compiles a `decode.c` file to WebAssembly and then utilizes the `wasm2c` compiler provided by the [wasm2c_sandbox_compiler](https://github.com/wrv/wasm2c_sandbox_compiler/tree/simdeverywhere). This generates C code which can be compiled to native code with `gcc`. 
+The `wasm2c_decode.sh` script compiles a `decode.c` file to WebAssembly and then utilizes the `wasm2c` compiler provided by the [wasm2c_sandbox_compiler](https://github.com/wrv/wasm2c_sandbox_compiler/tree/simdeverywhere). This generates C code which can be compiled to native code with `gcc` and the `main.c` file. *This step is currently non-functional.* 
 
 ```
 decode.c -> decode.wasm -> decode.c -> native code

build.sh

@@ -43,7 +43,7 @@ if [[ "$simd" = true && "$wasm" = true ]]; then # SIMD instructions and WASM tar
 	 -D_WASI_EMULATED_SIGNAL \
 	 -O3" \
 	LIBS=-lwasi-emulated-signal \
-	CPPFLAGS="-I${SIMDE_PATH}/wasm"
+	CPPFLAGS="-I${SIMDE_PATH}/simde/wasm"
 	LDFLAGS="-L${WASI_SDK_PATH}/share/wasi-sysroot/lib \
 	 -Wl,--no-entry \
 	 -Wl,--export-all \
@@ -60,7 +60,7 @@ if [[ "$simd" = true && "$wasm" = true ]]; then # SIMD instructions and WASM tar
 	make
 	make install 
 elif [[ "$simd" = true ]]; then # SSE and native target
-	CPPFLAGS="-I${SIMDE_PATH}/wasm" \
+	CPPFLAGS="-I${SIMDE_PATH}/simde/wasm" \
 	./configure --enable-intel-sse=yes 
 
 	make

decode.c

@@ -15,22 +15,17 @@
 #define BILLION 1000000000.0
 #define __USE_POSIX199309
 
-int main(int argc, char *argv[]) {
+double timed_decode(char *png_fn, char *out_fn) {
 	struct timespec start, end;
 	double dt;
 
-	if (argc < 2) {
-		printf("Not enough arguments provided.\n");
-		exit(1);
-	}
-
-	FILE *fp = fopen(argv[1], "rb");
+	FILE *fp = fopen(png_fn, "rb"); 
 	if (!fp) {
 		printf("Invalid file provided.\n");
 		exit(1);
 	}
 
-	FILE *out = fopen(argv[2], "a");
+	FILE *out = fopen(out_fn, "a");
 	if (!out) {
 		printf("Invalid file provided.\n");
 		exit(1);
@@ -70,8 +65,23 @@ int main(int argc, char *argv[]) {
 	fprintf(out, "%f\n", dt);
 
 	fclose(fp);
+	fclose(out);
 	for(int y = 0; y < height; y++) {
 		free(row_pointers[y]);
 	}
 	free(row_pointers);
+
+	return dt;
+}
+
+/**
+ * argv[1]: png image filename to decode
+ * argv[2]: output csv file for timing information
+ */
+int main(int argc, char *argv[]) {
+	if (argc < 2) {
+		printf("Not enough arguments provided.\n");
+		exit(1);
+	}
+	timed_decode(argv[1], argv[2]);
 }

full_test.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+# Currently this file is nonoperational - decode.c is temporarily changed to use wasm2c
+
 help() {
 	echo "Run benchmark test after building libpng library"
     echo "Note: For WASM Target, wasm_decode.sh should be run before"
@@ -48,7 +50,7 @@ if [[ "$simd" = true && "$wasm" = true ]]; then # SIMD instructions and WASM tar
 elif [[ "$simd" = true ]]; then # SSE and native target
 	cp /dev/null results/native_with_sse.csv
 
-	gcc -I/usr/local/include/libpng16 -I${SIMDE_PATH}/wasm \
+	gcc -I/usr/local/include/libpng16 -I${SIMDE_PATH}/simde/wasm \
 	-L/usr/local/lib -o out/decode decode.c -lpng16
 
 	for i in $(seq 1 $N)

main.c

@@ -0,0 +1,18 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <decode_mod.h>
+
+/**
+ * argv[1]: png image filename to decode
+ * argv[2]: output csv file for timing information
+ */
+int main(int argc, char *argv[]) {
+    wasm2c_sandbox_funcs_t sbx_details = get_wasm2c_sandbox_info();
+    sbx_details.wasm_rt_sys_init();
+    int max_wasm_page = 0;
+    wasm2c_sandbox_t* sbx_instance = (wasm2c_sandbox_t*) sbx_details.create_wasm2c_sandbox(max_wasm_page);
+    double dt = w2c_timed_decode(sbx_instance, argv[1], argv[2]);
+    printf("time: %f\n", dt);
+    sbx_details.destroy_wasm2c_sandbox(sbx_instance);
+    return 0;
+}