wasm: lucet no longer exists (merged into wasmtime).

Author: kanaka

IMPLS.yml

@@ -105,7 +105,6 @@ IMPL:
   # no self-host perf for wasm due to mac stack overflow
   - {IMPL: wasm, wasm_MODE: wasmtime,  NO_SELF_HOST_PERF: 1, NO_PERF: 1}
   - {IMPL: wasm, wasm_MODE: wasmer,    NO_SELF_HOST_PERF: 1, NO_PERF: 1}
-  - {IMPL: wasm, wasm_MODE: lucet,     NO_SELF_HOST_PERF: 1, NO_PERF: 1}
   #- {IMPL: wasm, wasm_MODE: wax,       NO_SELF_HOST_PERF: 1}  # Hangs on GH Actions
   - {IMPL: wasm, wasm_MODE: node,      NO_SELF_HOST_PERF: 1, NO_PERF: 1}
   #- {IMPL: wasm, wasm_MODE: warpy,     NO_SELF_HOST_PERF: 1}  # Hangs on GH Actions

Makefile.impls

@@ -26,7 +26,7 @@ python_MODE = python
 scheme_MODE = chibi
 # sml (polyml, mlton, mosml)
 sml_MODE = polyml
-# wasmtime wasmer lucet wax  node warpy  wace_libc
+# wasmtime wasmer wax  node warpy  wace_libc
 wasm_MODE = wasmtime
 
 
@@ -191,7 +191,7 @@ vala_STEP_TO_PROG =          impls/vala/$($(1))
 vb_STEP_TO_PROG =            impls/vb/$($(1)).exe
 vhdl_STEP_TO_PROG =          impls/vhdl/$($(1))
 vimscript_STEP_TO_PROG =     impls/vimscript/$($(1)).vim
-wasm_STEP_TO_PROG =          impls/wasm/$($(1)).$(if $(filter lucet,$(wasm_MODE)),so,wasm)
+wasm_STEP_TO_PROG =          impls/wasm/$($(1)).wasm
 wren_STEP_TO_PROG =          impls/wren/$($(1)).wren
 yorick_STEP_TO_PROG =        impls/yorick/$($(1)).i
 xslt_STEP_TO_PROG =          impls/xslt/$($(1))

README.md

@@ -41,7 +41,7 @@ process guide](process/guide.md) there is also a [mal/make-a-lisp
 FAQ](docs/FAQ.md) where I attempt to answer some common questions.
 
 
-**3. Mal is implemented in 87 languages (93 different implementations and 115 runtime modes)**
+**3. Mal is implemented in 87 languages (93 different implementations and 114 runtime modes)**
 
 | Language | Creator |
 | -------- | ------- |
@@ -1225,7 +1225,6 @@ runs under several different non-web embeddings (runtimes):
 [node](https://nodejs.org),
 [wasmtime](https://github.com/CraneStation/wasmtime),
 [wasmer](https://wasmer.io),
-[lucet](https://github.com/fastly/lucet),
 [wax](https://github.com/kanaka/wac),
 [wace](https://github.com/kanaka/wac),
 [warpy](https://github.com/kanaka/warpy).
@@ -1241,9 +1240,6 @@ wasmtime --dir=./ --dir=../ --dir=/ ./stepX_YYY.wasm
 # wasmer
 make wasm_MODE=wasmer
 wasmer run --dir=./ --dir=../ --dir=/ ./stepX_YYY.wasm
-# lucet
-make wasm_MODE=lucet
-lucet-wasi --dir=./:./ --dir=../:../ --dir=/:/ ./stepX_YYY.so
 # wax
 make wasm_MODE=wax
 wax ./stepX_YYY.wasm

impls/wasm/Dockerfile

@@ -153,14 +153,6 @@ RUN curl https://get.wasmer.io -sSfL | sh && \
 #    cargo build --release && \
 #    cp target/release/wasmer /usr/bin/
 
-#
-# lucet
-#
-
-RUN git clone --recursive https://github.com/fastly/lucet && \
-    cd lucet && \
-    make install
-
 #
 # wasmtime
 #
@@ -188,11 +180,6 @@ COPY --from=runtimes /usr/bin/warpy /usr/bin/warpy
 COPY --from=runtimes /usr/bin/wasmtime /usr/bin/wasmtime
 COPY --from=runtimes /usr/bin/wasm2obj /usr/bin/wasm2obj
 
-RUN mkdir -p /opt/lucet/bin
-COPY --from=runtimes /opt/lucet/ /opt/lucet
-RUN ln -sf /opt/lucet/bin/lucetc-wasi /usr/bin/lucetc-wasi
-RUN ln -sf /opt/lucet/bin/lucet-wasi /usr/bin/lucet-wasi
-
 COPY --from=runtimes /usr/bin/wasmer /usr/bin/wasmer
 COPY --from=runtimes /usr/bin/wapm /usr/bin/wapm
 

impls/wasm/Makefile

@@ -5,11 +5,10 @@ MODE ?= $(strip \
 	      direct,\
 	      wasi)))
 
-EXT = $(if $(filter lucet,$(wasm_MODE)),.so,.wasm)
+EXT = .wasm
 
 WASM_AS ?= wasm-as
 WAMP ?= node_modules/.bin/wamp
-LUCETC ?= lucetc-wasi
 
 STEP0_DEPS = $(WAMP) platform_$(MODE).wam string.wam printf.wam
 STEP1_DEPS = $(STEP0_DEPS) types.wam mem.wam debug.wam reader.wam printer.wam
@@ -31,10 +30,6 @@ node_modules/.bin/wamp:
 %.wasm: %.wat
 	$(WASM_AS) $< -o $@
 
-# lucet object binaries
-%.so: %.wasm
-	$(LUCETC) $< -o $@
-
 step0_repl.wat: $(STEP0_DEPS)
 step1_read_print.wat step2_eval.wat: $(STEP1_DEPS)
 step3_env.wat: $(STEP3_DEPS)
@@ -44,4 +39,4 @@ step7_quote.wat step8_macros.wat step9_try.wat stepA_mal.wat: $(STEP4_DEPS)
 .PHONY: clean
 
 clean:
-	rm -f *.wat *.wasm *.so
+	rm -f *.wat *.wasm

impls/wasm/run

@@ -3,8 +3,6 @@ STEP=${STEP:-stepA_mal}
 case "${wasm_MODE}" in
 wasmtime)
     exec wasmtime --dir=./ --dir=../ --dir=/ $(dirname $0)/${STEP:-stepA_mal}.wasm "${@}" ;;
-lucet)
-    exec lucet-wasi --dir=./:./ --dir=../:../ --dir=/:/ $(dirname $0)/${STEP:-stepA_mal}.so -- "${@}" ;;
 wasmer)
     exec wasmer run --dir=./ --dir=../ --dir=/ $(dirname $0)/${STEP:-stepA_mal}.wasm -- "${@}" ;;
 warpy)