Skip to content

Commit

Permalink
Update bindings and dependencies to WASI 0.2.0 (#471)
Browse files Browse the repository at this point in the history 
* make the Makefiles a bit more robust

- Escape "." character in `sed` regex
- Ensure that %.wasm target fails cleanly (i.e. without generating the target file) if `wasm-tools` fails

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

* split `component new` rule out of link rule for Preview 2

We now explicitly distinquish between core module files (%.core.wasm) and
component files (%.wasm), which helps avoid the trickery in my previous commit.

In order to test this properly, I needed to update the Wasmtime URL to point to
v17.0.0 instead of dev (which we needed to do anyway), and that in turn required
updating the bindings to use the final WASI 0.2.0 release.

Signed-off-by: Joel Dice <joel.dice@fermyon.com>

---------

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
  • Loading branch information
@dicej
dicej authored Feb 22, 2024
1 parent 212296e commit 55df1f5
Show file tree
Hide file tree
Showing 7 changed files with 313 additions and 428 deletions.
67 changes: 32 additions & 35 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ OBJDIR ?= build/$(TARGET_TRIPLE)
# The directory where we store files and tools for generating WASI Preview 2 bindings
BINDING_WORK_DIR ?= build/bindings
# URL from which to retrieve the WIT files used to generate the WASI Preview 2 bindings
WASI_CLI_URL ?= https://github.com/WebAssembly/wasi-cli/archive/refs/tags/v0.2.0-rc-2023-12-05.tar.gz
WASI_CLI_URL ?= https://github.com/WebAssembly/wasi-cli/archive/refs/tags/v0.2.0.tar.gz
# URL from which to retrieve the `wit-bindgen` command used to generate the WASI
# Preview 2 bindings.
#
# TODO: Switch to bytecodealliance/wit-bindgen 0.17.0 once it's released (which
# will include https://github.com/bytecodealliance/wit-bindgen/pull/804 and
# https://github.com/bytecodealliance/wit-bindgen/pull/805, which we rely on)
WIT_BINDGEN_URL ?= https://github.com/dicej/wit-bindgen/releases/download/wit-bindgen-cli-0.17.0-dicej-pre0/wit-bindgen-v0.17.0-dicej-pre0-x86_64-linux.tar.gz
WIT_BINDGEN_URL ?= https://github.com/bytecodealliance/wit-bindgen/releases/download/wit-bindgen-cli-0.17.0/wit-bindgen-v0.17.0-x86_64-linux.tar.gz

# When the length is no larger than this threshold, we consider the
# overhead of bulk memory opcodes to outweigh the performance benefit,
Expand Down Expand Up @@ -854,40 +850,41 @@ $(BINDING_WORK_DIR)/wit-bindgen:
bindings: $(BINDING_WORK_DIR)/wasi-cli $(BINDING_WORK_DIR)/wit-bindgen
cd "$(BINDING_WORK_DIR)" && \
./wit-bindgen/wit-bindgen c \
--autodrop-borrows yes \
--rename-world preview2 \
--type-section-suffix __wasi_libc \
--world wasi:cli/imports@0.2.0-rc-2023-12-05 \
--rename wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-10=monotonic_clock \
--rename wasi:clocks/wall-clock@0.2.0-rc-2023-11-10=wall_clock \
--rename wasi:filesystem/preopens@0.2.0-rc-2023-11-10=filesystem_preopens \
--rename wasi:filesystem/types@0.2.0-rc-2023-11-10=filesystem \
--rename wasi:io/error@0.2.0-rc-2023-11-10=io_error \
--rename wasi:io/poll@0.2.0-rc-2023-11-10=poll \
--rename wasi:io/streams@0.2.0-rc-2023-11-10=streams \
--rename wasi:random/insecure-seed@0.2.0-rc-2023-11-10=random_insecure_seed \
--rename wasi:random/insecure@0.2.0-rc-2023-11-10=random_insecure \
--rename wasi:random/random@0.2.0-rc-2023-11-10=random \
--rename wasi:sockets/instance-network@0.2.0-rc-2023-11-10=instance_network \
--rename wasi:sockets/ip-name-lookup@0.2.0-rc-2023-11-10=ip_name_lookup \
--rename wasi:sockets/network@0.2.0-rc-2023-11-10=network \
--rename wasi:sockets/tcp-create-socket@0.2.0-rc-2023-11-10=tcp_create_socket \
--rename wasi:sockets/tcp@0.2.0-rc-2023-11-10=tcp \
--rename wasi:sockets/udp-create-socket@0.2.0-rc-2023-11-10=udp_create_socket \
--rename wasi:sockets/udp@0.2.0-rc-2023-11-10=udp \
--rename wasi:cli/environment@0.2.0-rc-2023-12-05=environment \
--rename wasi:cli/exit@0.2.0-rc-2023-12-05=exit \
--rename wasi:cli/stdin@0.2.0-rc-2023-12-05=stdin \
--rename wasi:cli/stdout@0.2.0-rc-2023-12-05=stdout \
--rename wasi:cli/stderr@0.2.0-rc-2023-12-05=stderr \
--rename wasi:cli/terminal-input@0.2.0-rc-2023-12-05=terminal_input \
--rename wasi:cli/terminal-output@0.2.0-rc-2023-12-05=terminal_output \
--rename wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05=terminal_stdin \
--rename wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05=terminal_stdout \
--rename wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05=terminal_stderr \
--world wasi:cli/imports@0.2.0 \
--rename wasi:clocks/monotonic-clock@0.2.0=monotonic_clock \
--rename wasi:clocks/wall-clock@0.2.0=wall_clock \
--rename wasi:filesystem/preopens@0.2.0=filesystem_preopens \
--rename wasi:filesystem/types@0.2.0=filesystem \
--rename wasi:io/error@0.2.0=io_error \
--rename wasi:io/poll@0.2.0=poll \
--rename wasi:io/streams@0.2.0=streams \
--rename wasi:random/insecure-seed@0.2.0=random_insecure_seed \
--rename wasi:random/insecure@0.2.0=random_insecure \
--rename wasi:random/random@0.2.0=random \
--rename wasi:sockets/instance-network@0.2.0=instance_network \
--rename wasi:sockets/ip-name-lookup@0.2.0=ip_name_lookup \
--rename wasi:sockets/network@0.2.0=network \
--rename wasi:sockets/tcp-create-socket@0.2.0=tcp_create_socket \
--rename wasi:sockets/tcp@0.2.0=tcp \
--rename wasi:sockets/udp-create-socket@0.2.0=udp_create_socket \
--rename wasi:sockets/udp@0.2.0=udp \
--rename wasi:cli/environment@0.2.0=environment \
--rename wasi:cli/exit@0.2.0=exit \
--rename wasi:cli/stdin@0.2.0=stdin \
--rename wasi:cli/stdout@0.2.0=stdout \
--rename wasi:cli/stderr@0.2.0=stderr \
--rename wasi:cli/terminal-input@0.2.0=terminal_input \
--rename wasi:cli/terminal-output@0.2.0=terminal_output \
--rename wasi:cli/terminal-stdin@0.2.0=terminal_stdin \
--rename wasi:cli/terminal-stdout@0.2.0=terminal_stdout \
--rename wasi:cli/terminal-stderr@0.2.0=terminal_stderr \
./wasi-cli/wit && \
mv preview2.h ../../libc-bottom-half/headers/public/wasi/ && \
mv preview2_component_type.o ../../libc-bottom-half/sources && \
sed 's_#include "preview2.h"_#include "wasi/preview2.h"_' \
sed 's_#include "preview2\.h"_#include "wasi/preview2.h"_' \
< preview2.c \
> ../../libc-bottom-half/sources/preview2.c && \
rm preview2.c
Expand Down
5 changes: 0 additions & 5 deletions expected/wasm32-wasi-preview2/defined-symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,6 @@ tcp_method_tcp_socket_finish_bind
tcp_method_tcp_socket_finish_connect
tcp_method_tcp_socket_finish_listen
tcp_method_tcp_socket_hop_limit
tcp_method_tcp_socket_ipv6_only
tcp_method_tcp_socket_is_listening
tcp_method_tcp_socket_keep_alive_count
tcp_method_tcp_socket_keep_alive_enabled
Expand All @@ -1246,7 +1245,6 @@ tcp_method_tcp_socket_receive_buffer_size
tcp_method_tcp_socket_remote_address
tcp_method_tcp_socket_send_buffer_size
tcp_method_tcp_socket_set_hop_limit
tcp_method_tcp_socket_set_ipv6_only
tcp_method_tcp_socket_set_keep_alive_count
tcp_method_tcp_socket_set_keep_alive_enabled
tcp_method_tcp_socket_set_keep_alive_idle_time
Expand Down Expand Up @@ -1329,12 +1327,10 @@ udp_method_outgoing_datagram_stream_send
udp_method_outgoing_datagram_stream_subscribe
udp_method_udp_socket_address_family
udp_method_udp_socket_finish_bind
udp_method_udp_socket_ipv6_only
udp_method_udp_socket_local_address
udp_method_udp_socket_receive_buffer_size
udp_method_udp_socket_remote_address
udp_method_udp_socket_send_buffer_size
udp_method_udp_socket_set_ipv6_only
udp_method_udp_socket_set_receive_buffer_size
udp_method_udp_socket_set_send_buffer_size
udp_method_udp_socket_set_unicast_hop_limit
Expand All @@ -1346,7 +1342,6 @@ udp_option_ip_socket_address_free
udp_outgoing_datagram_free
udp_outgoing_datagram_stream_drop_borrow
udp_outgoing_datagram_stream_drop_own
udp_result_bool_error_code_free
udp_result_ip_socket_address_error_code_free
udp_result_list_incoming_datagram_error_code_free
udp_result_tuple2_own_incoming_datagram_stream_own_outgoing_datagram_stream_error_code_free
Expand Down
4 changes: 0 additions & 4 deletions expected/wasm32-wasi-preview2/undefined-symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ __wasm_import_tcp_method_tcp_socket_finish_bind
__wasm_import_tcp_method_tcp_socket_finish_connect
__wasm_import_tcp_method_tcp_socket_finish_listen
__wasm_import_tcp_method_tcp_socket_hop_limit
__wasm_import_tcp_method_tcp_socket_ipv6_only
__wasm_import_tcp_method_tcp_socket_is_listening
__wasm_import_tcp_method_tcp_socket_keep_alive_count
__wasm_import_tcp_method_tcp_socket_keep_alive_enabled
Expand All @@ -162,7 +161,6 @@ __wasm_import_tcp_method_tcp_socket_receive_buffer_size
__wasm_import_tcp_method_tcp_socket_remote_address
__wasm_import_tcp_method_tcp_socket_send_buffer_size
__wasm_import_tcp_method_tcp_socket_set_hop_limit
__wasm_import_tcp_method_tcp_socket_set_ipv6_only
__wasm_import_tcp_method_tcp_socket_set_keep_alive_count
__wasm_import_tcp_method_tcp_socket_set_keep_alive_enabled
__wasm_import_tcp_method_tcp_socket_set_keep_alive_idle_time
Expand Down Expand Up @@ -190,12 +188,10 @@ __wasm_import_udp_method_outgoing_datagram_stream_send
__wasm_import_udp_method_outgoing_datagram_stream_subscribe
__wasm_import_udp_method_udp_socket_address_family
__wasm_import_udp_method_udp_socket_finish_bind
__wasm_import_udp_method_udp_socket_ipv6_only
__wasm_import_udp_method_udp_socket_local_address
__wasm_import_udp_method_udp_socket_receive_buffer_size
__wasm_import_udp_method_udp_socket_remote_address
__wasm_import_udp_method_udp_socket_send_buffer_size
__wasm_import_udp_method_udp_socket_set_ipv6_only
__wasm_import_udp_method_udp_socket_set_receive_buffer_size
__wasm_import_udp_method_udp_socket_set_send_buffer_size
__wasm_import_udp_method_udp_socket_set_unicast_hop_limit
Expand Down
Loading

0 comments on commit 55df1f5

Please sign in to comment.