wip

Author: maxfierke

.gitignore

@@ -19,4 +19,6 @@ all_spec
 
 # Test suite object files
 *.o
+*.wat
+*.wast
 *.wasm

Makefile

@@ -131,6 +131,7 @@ $(LIB_CRYSTAL_TARGET): $(LIB_CRYSTAL_OBJS)
 clean: clean_crystal ## Clean up built directories and files
 	rm -rf $(LLVM_EXT_OBJ)
 	rm -rf $(LIB_CRYSTAL_OBJS) $(LIB_CRYSTAL_TARGET)
+	rm -rf *.o *.wasm *.wat
 
 .PHONY: clean_crystal
 clean_crystal: ## Clean up crystal built files

spec/generate_wasm_spec.sh

@@ -34,6 +34,8 @@ set +x
 SPEC_SUITE=${1:-std}
 RUNNER=${RUNNER:-wavm run --abi=wasi --enable all-proposed}
 WASI_SDK_PATH=${WASI_SDK_PATH:-"$HOME/toolchains/wasi-sdk-11.0"}
+WASM_DIS=${WASM_DIS:-"$HOME/toolchains/bin/wasm-dis"}
+WASM_OPT=${WASM_OPT:-"$HOME/toolchains/bin/wasm-opt -O --asyncify"}
 
 INITIAL_MEMORY=${INITIAL_MEMORY:-16777216}
 MAX_MEMORY=${MAX_MEMORY:-2147483648}
@@ -42,7 +44,9 @@ STACK_SIZE=${STACK_SIZE:-5242880}
 export CC="$WASI_SDK_PATH/bin/clang --sysroot=$WASI_SDK_PATH/share/wasi-sysroot"
 export LIBRARY_PATH="$WASI_SDK_PATH/share/wasi-sysroot/lib/wasm32-wasi"
 export CRYSTAL_LIBRARY_PATH="$HOME/toolchains/crystal-wasm-libs/targets/wasm32-wasi"
-export WASM_LDFLAGS="-Wl,--allow-undefined \
+# -Wl,--export-all \
+export WASM_LDFLAGS="-lwasi-emulated-mman -lwasi-emulated-signal \
+-Wl,--allow-undefined \
 -Wl,--initial-memory=${INITIAL_MEMORY} \
 -Wl,--max-memory=${MAX_MEMORY}         \
 -Wl,-z -Wl,stack-size=${STACK_SIZE}    \
@@ -75,7 +79,20 @@ for spec in $(find "spec/$SPEC_SUITE" -type f -iname "*_spec.cr" | sort); do
     continue
   fi
 
-  binary_path="./$(echo "$linker_command" | grep -oP '(?<=-o\s)(.*)(?=\.wasm)').wasm"
+  program_name=$(echo "$linker_command" | grep -oP '(?<=-o\s)(.*)(?=\.wasm)')
+  preopt_wasm_path="./$program_name.wasm"
+  preopt_wat_path="./$program_name.wat"
+
+  if ! $WASM_DIS "$preopt_wasm_path" > "$preopt_wat_path"; then
+    echo "# $require (failed to run wasm-dis)"
+    continue
+  fi
+
+  binary_path=$preopt_wasm_path
+  if ! $WASM_OPT -o "$binary_path" "$preopt_wat_path"; then
+    echo "# $require (failed to run wasm-opt)"
+    continue
+  fi
 
   $RUNNER "$binary_path" > /dev/null; exit=$?
 

spec/run_wasm_spec.sh

@@ -3,24 +3,28 @@
 set -euo pipefail
 
 WASI_SDK_PATH=${WASI_SDK_PATH:-"$HOME/toolchains/wasi-sdk-11.0"}
+WASM_DIS=${WASM_DIS:-"$HOME/toolchains/bin/wasm-dis"}
+WASM_OPT=${WASM_OPT:-"$HOME/toolchains/bin/wasm-opt -g --asyncify"}
 INITIAL_MEMORY=${INITIAL_MEMORY:-16777216}
 MAX_MEMORY=${MAX_MEMORY:-2147483648}
 STACK_SIZE=${STACK_SIZE:-5242880}
 
 export CC="$WASI_SDK_PATH/bin/clang --sysroot=$WASI_SDK_PATH/share/wasi-sysroot"
 export LIBRARY_PATH="$WASI_SDK_PATH/share/wasi-sysroot/lib/wasm32-wasi"
 export CRYSTAL_LIBRARY_PATH="$HOME/toolchains/crystal-wasm-libs/targets/wasm32-wasi"
-export WASM_LDFLAGS="-Wl,--allow-undefined \
+export WASM_LDFLAGS="-lwasi-emulated-mman -lwasi-emulated-signal \
+-Wl,--allow-undefined \
 -Wl,--initial-memory=${INITIAL_MEMORY} \
 -Wl,--max-memory=${MAX_MEMORY}         \
 -Wl,-z -Wl,stack-size=${STACK_SIZE}    \
 -Wl,--stack-first                      \
 -Wl,--no-threads"
 
+entry=${1:-"spec/std_spec.cr --exclude-warnings spec/std --exclude-warnings spec/compiler"}
+
 linker_command=$(bin/crystal build \
-  spec/std_spec.cr \
-  --exclude-warnings spec/std \
-  --exclude-warnings spec/compiler \
+  $entry \
+  -Ddebug_raise \
   -Dgc_none \
   -Dwithout_openssl \
   -Dwithout_zlib \
@@ -30,10 +34,18 @@ linker_command=$(bin/crystal build \
   --static \
   --error-trace \
   --link-flags="$WASM_LDFLAGS")
-binary_path="./$(echo "$linker_command" | grep -oP '(?<=-o\s)(.*)(?=\.wasm)').wasm"
+
+program_name=$(echo "$linker_command" | grep -oP '(?<=-o\s)(.*)(?=\.wasm)')
+preopt_wasm_path="./$program_name.wasm"
+preopt_wat_path="./$program_name.wat"
+binary_path=$preopt_wasm_path
 
 eval $linker_command
 
+$WASM_DIS "$preopt_wasm_path" > "$preopt_wat_path"
+$WASM_OPT -o "$binary_path" "$preopt_wat_path"
+
+# --wasi-trace=syscalls-with-callstacks \
 wavm run \
   --abi=wasi \
   --enable all-proposed \

src/crystal/fiber_channel.cr

@@ -1,3 +1,4 @@
+{% skip_file if flag?(:wasi) %}
 # :nodoc:
 #
 # This struct wraps around a IO pipe to send and receive fibers between

src/crystal/scheduler.cr

@@ -2,8 +2,16 @@ require "crystal/system/event_loop"
 require "crystal/system/print_error"
 require "./fiber_channel"
 require "fiber"
+require "fiber/context"
+require "fiber/context/wasm32"
 require "crystal/system/thread"
 
+{% if flag?(:wasi) %}
+lib Asyncify
+  fun stop_rewind()
+end
+{% end %}
+
 # :nodoc:
 #
 # Schedulers are tied to a thread, and must only ever be accessed from within
@@ -120,8 +128,8 @@ class Crystal::Scheduler
 
   private def fatal_resume_error(fiber, message)
     Crystal::System.print_error "\nFATAL: #{message}: #{fiber}\n"
-    {% unless flag?(:win32) %}
-      # FIXME: Enable when caller is supported on win32
+    {% unless flag?(:win32) || flag?(:wasi) %}
+      # FIXME: Enable when caller is supported on win32 and/or wasi
       caller.each { |line| Crystal::System.print_error "  from #{line}\n" }
     {% end %}
 
@@ -141,6 +149,10 @@ class Crystal::Scheduler
   {% end %}
 
   protected def reschedule : Nil
+    {% if flag?(:wasi) %}
+      Asyncify.stop_rewind
+    {% end %}
+
     loop do
       if runnable = @lock.sync { @runnables.shift? }
         unless runnable == Fiber.current

src/crystal/system/event_loop.cr

@@ -28,7 +28,7 @@ struct Crystal::Event
   # def add(time_span : Time::Span?) : Nil
 end
 
-{% if flag?(:unix) %}
+{% if flag?(:unix) || flag?(:wasi) %}
   require "./unix/event_loop_libevent"
 {% elsif flag?(:win32) %}
   require "./win32/event_loop_iocp"

src/crystal/system/fiber.cr

@@ -9,7 +9,7 @@ module Crystal::System::Fiber
   # def self.main_fiber_stack(stack_bottom : Void*) : Void*
 end
 
-{% if flag?(:unix) %}
+{% if flag?(:unix) || flag?(:wasi) %}
   require "./unix/fiber"
 {% elsif flag?(:win32) %}
   require "./win32/fiber"

src/crystal/system/thread.cr

@@ -31,6 +31,8 @@ require "./thread_linked_list"
 {% if flag?(:unix) %}
   require "./unix/pthread"
   require "./unix/pthread_condition_variable"
+{% elsif flag?(:wasi) %}
+  require "./wasi/thread"
 {% elsif flag?(:win32) %}
   require "./win32/thread"
 {% else %}

src/crystal/system/thread_mutex.cr

@@ -19,8 +19,10 @@ end
 
 {% if flag?(:unix) %}
   require "./unix/pthread_mutex"
+{% elsif flag?(:wasi) %}
+  require "./wasi/thread_mutex"
 {% elsif flag?(:win32) %}
   require "./win32/thread_mutex"
-{% else %}
+{% else%}
   {% raise "thread not supported" %}
 {% end %}