github
/
wasi-libc
mirror of https://github.com/WebAssembly/wasi-libc
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
367 Commits
9 Branches
7 Tags
20 MiB
Tree: a963040f0a
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a963040f0a'
${ noResults }
wasi-libc/test/Makefile

207 lines
7.5 KiB
Raw Normal View History

test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
# Build the `libc-test` tests as Wasm programs and run them with the selected
# engine. Contributors beware! This Makefile follows the style of the
# `libc-test` Makefile and uses some more exotic features of `make`.
#
# The top-level `test` target is composed of a chain of several phony
# sub-targets:
# - `download`: retrieve the `libc-test` source from a Git `$(MIRROR)`
# - `build`: construct Wasm modules for a subset of the `libc-test` tests
# - `run`: execute the benchmarks with a Wasm `$(ENGINE)` of choice (e.g.,
# Wasmtime)
test: run
# Unlike the `libc-test` directory, we will output all artifacts to the `build`
# directory (keeping with the `wasi-libc` conventions).
OBJDIR ?= $(CURDIR)/build
DOWNDIR ?= $(CURDIR)/download
add WASI Preview 2 bindings (#460) * add WASI Preview 2 bindings This adds C bindings generated from the `wasi:cli/imports@0.2.0-rc-2023-12-05` world, plus a makefile target to regenerate them from the WIT source files. We'll use these bindings to call Preview 2 host functions when building for the `wasm32-wasi-preview2` target. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * update to pre-release of `wit-bindgen` 0.17.0 This includes https://github.com/bytecodealliance/wit-bindgen/pull/804 (fix broken indentation in generated code) and https://github.com/bytecodealliance/wit-bindgen/pull/805 (support overriding world name and adding a suffix to the component type custom section). Signed-off-by: Joel Dice <joel.dice@fermyon.com> * test all targets; update preview2 expected output files Signed-off-by: Joel Dice <joel.dice@fermyon.com> * build for `wasm32-wasi-threads` before testing it Signed-off-by: Joel Dice <joel.dice@fermyon.com> * move generated bindings per review feedback Since these files aren't part of cloudlibc, no reason to put them under the cloudlibc directory. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * move preview2.h to wasi directory Signed-off-by: Joel Dice <joel.dice@fermyon.com> --------- Signed-off-by: Joel Dice <joel.dice@fermyon.com>
10 months ago
TARGET_TRIPLE ?= wasm32-wasi
add `wasm32-wasi-preview2` target (#457) Currently, this is identical to the `wasm32-wasi` in all but name. See #449 for the next step, which is to incrementally add Preview 2 features, e.g. `wasi-sockets`. Per the discussion in that PR, I've split the `wasi-sysroot/include` directory into per-target directories. Eventually, we'll want to build a separate sysroot for each target, but there's currently uncertainty about how to configure the default sysroot for e.g. clang, so we're not tackling that yet. See also #447 for further details. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
11 months ago
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
##### DOWNLOAD #################################################################
LIBC_TEST_URL ?= https://github.com/bytecodealliance/libc-test
LIBC_TEST = $(DOWNDIR)/libc-test
LIBRT_URL ?= https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-16/libclang_rt.builtins-wasm32-wasi-16.0.tar.gz
LIBRT = $(DOWNDIR)/lib/wasi/libclang_rt.builtins-wasm32.a
test: use the same version of wasmtime and adapter (#468) To avoid errors like: ``` Caused by: 0: import `wasi:cli/environment@0.2.0-rc-2023-12-05` has the wrong type 1: instance export `get-arguments` has the wrong type 2: expected func found nothing make: *** [Makefile:185: /home/runner/work/wasi-libc/wasi-libc/test/build/functional/argv.wasm.err] Error 1 Error: Process completed with exit code 2. ``` Also, bump them to 17.
9 months ago
WASMTIME_URL ?= https://github.com/bytecodealliance/wasmtime/releases/download/v17.0.0/wasmtime-v17.0.0-x86_64-linux.tar.xz
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
WASMTIME = $(DOWNDIR)/$(shell basename $(WASMTIME_URL) .tar.xz)/wasmtime
add `wasm32-wasi-preview2` target (#457) Currently, this is identical to the `wasm32-wasi` in all but name. See #449 for the next step, which is to incrementally add Preview 2 features, e.g. `wasi-sockets`. Per the discussion in that PR, I've split the `wasi-sysroot/include` directory into per-target directories. Eventually, we'll want to build a separate sysroot for each target, but there's currently uncertainty about how to configure the default sysroot for e.g. clang, so we're not tackling that yet. See also #447 for further details. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
11 months ago
WASM_TOOLS_URL ?= https://github.com/bytecodealliance/wasm-tools/releases/download/wasm-tools-1.0.54/wasm-tools-1.0.54-x86_64-linux.tar.gz
WASM_TOOLS = $(DOWNDIR)/$(shell basename $(WASM_TOOLS_URL) .tar.gz)/wasm-tools
test: use the same version of wasmtime and adapter (#468) To avoid errors like: ``` Caused by: 0: import `wasi:cli/environment@0.2.0-rc-2023-12-05` has the wrong type 1: instance export `get-arguments` has the wrong type 2: expected func found nothing make: *** [Makefile:185: /home/runner/work/wasi-libc/wasi-libc/test/build/functional/argv.wasm.err] Error 1 Error: Process completed with exit code 2. ``` Also, bump them to 17.
9 months ago
ADAPTER_URL ?= https://github.com/bytecodealliance/wasmtime/releases/download/v17.0.0/wasi_snapshot_preview1.command.wasm
add `wasm32-wasi-preview2` target (#457) Currently, this is identical to the `wasm32-wasi` in all but name. See #449 for the next step, which is to incrementally add Preview 2 features, e.g. `wasi-sockets`. Per the discussion in that PR, I've split the `wasi-sysroot/include` directory into per-target directories. Eventually, we'll want to build a separate sysroot for each target, but there's currently uncertainty about how to configure the default sysroot for e.g. clang, so we're not tackling that yet. See also #447 for further details. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
11 months ago
ADAPTER = $(DOWNDIR)/wasi_snapshot_preview1.command.wasm
TO_DOWNLOAD = $(LIBC_TEST) $(LIBRT) $(WASMTIME)
add WASI Preview 2 bindings (#460) * add WASI Preview 2 bindings This adds C bindings generated from the `wasi:cli/imports@0.2.0-rc-2023-12-05` world, plus a makefile target to regenerate them from the WIT source files. We'll use these bindings to call Preview 2 host functions when building for the `wasm32-wasi-preview2` target. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * update to pre-release of `wit-bindgen` 0.17.0 This includes https://github.com/bytecodealliance/wit-bindgen/pull/804 (fix broken indentation in generated code) and https://github.com/bytecodealliance/wit-bindgen/pull/805 (support overriding world name and adding a suffix to the component type custom section). Signed-off-by: Joel Dice <joel.dice@fermyon.com> * test all targets; update preview2 expected output files Signed-off-by: Joel Dice <joel.dice@fermyon.com> * build for `wasm32-wasi-threads` before testing it Signed-off-by: Joel Dice <joel.dice@fermyon.com> * move generated bindings per review feedback Since these files aren't part of cloudlibc, no reason to put them under the cloudlibc directory. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * move preview2.h to wasi directory Signed-off-by: Joel Dice <joel.dice@fermyon.com> --------- Signed-off-by: Joel Dice <joel.dice@fermyon.com>
10 months ago
ifeq ($(TARGET_TRIPLE), wasm32-wasi-preview2)
add `wasm32-wasi-preview2` target (#457) Currently, this is identical to the `wasm32-wasi` in all but name. See #449 for the next step, which is to incrementally add Preview 2 features, e.g. `wasi-sockets`. Per the discussion in that PR, I've split the `wasi-sysroot/include` directory into per-target directories. Eventually, we'll want to build a separate sysroot for each target, but there's currently uncertainty about how to configure the default sysroot for e.g. clang, so we're not tackling that yet. See also #447 for further details. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
11 months ago
TO_DOWNLOAD += $(ADAPTER) $(WASM_TOOLS)
endif
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
add `wasm32-wasi-preview2` target (#457) Currently, this is identical to the `wasm32-wasi` in all but name. See #449 for the next step, which is to incrementally add Preview 2 features, e.g. `wasi-sockets`. Per the discussion in that PR, I've split the `wasi-sysroot/include` directory into per-target directories. Eventually, we'll want to build a separate sysroot for each target, but there's currently uncertainty about how to configure the default sysroot for e.g. clang, so we're not tackling that yet. See also #447 for further details. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
11 months ago
download: $(TO_DOWNLOAD)
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
$(DOWNDIR):
mkdir -p download
$(LIBC_TEST): | $(DOWNDIR)
git clone --depth 1 $(LIBC_TEST_URL) $@
# TODO install target to place into...
$(LIBRT): | $(DOWNDIR)
wget --no-clobber --directory-prefix=$(DOWNDIR) $(LIBRT_URL)
Start renaming preview1 to p1 and preview2 to p2 (#478) * Start renaming preview1 to p1 and preview2 to p2 This is an initial start at renaming the "preview" terminology in WASI targets to "pX". For example the `wasm32-wasi` target should transition to `wasm32-wasip1`, `wasm32-wasi-preview2` should transition to `wasm32-wasip2`, and `wasm32-wasi-threads` should transition to `wasm32-wasip1-threads`. This commit applies a few renames in the `Makefile` such as: * `WASI_SNAPSHOT` is now either "p1" or "p2" * The default p2 target triple is now `wasm32-wasip2` instead of `wasm32-wasi-preview2` (in the hopes that it's early enough to change the default). * Bindings for WASIp2 were renamed from "preview2" terminology to "wasip2". * The expected-defines files are renamed and the logic of which expectation was used has been updated slightly. With this commit the intention is that non-preview2 defaults do not change. For example the default build still produces a `wasm32-wasi` sysroot. If `TARGET_TRIPLE=wasm32-wasip1` is passed, however, then that sysroot is produced instead. Similarly a `THREAD_MODEL=posix` build produces a `wasm32-wasi-threads` sysroot target but you can now also pass `TARGET_TRIPLE=wasm32-wasip1-threads` to rename the sysroot. My hope is to integrate this into the wasi-sdk repository and build a dual sysroot for these new targets for a release or two so both are supported and then in the future the defaults can be switched away from `wasm32-wasi` to `wasm32-wasip1` as built-by-default. * Update builds in CI * Update test workflow * Fix test for wasm32-wasip1-threads * Make github actions rules a bit more readable
8 months ago
tar --extract --file=$(DOWNDIR)/$(shell basename $(LIBRT_URL)) --directory=$(DOWNDIR)/
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
$(WASMTIME): | $(DOWNDIR)
wget --no-clobber --directory-prefix=$(DOWNDIR) $(WASMTIME_URL)
tar --extract --file=$(DOWNDIR)/$(shell basename $(WASMTIME_URL)) --directory=$(DOWNDIR)/
add `wasm32-wasi-preview2` target (#457) Currently, this is identical to the `wasm32-wasi` in all but name. See #449 for the next step, which is to incrementally add Preview 2 features, e.g. `wasi-sockets`. Per the discussion in that PR, I've split the `wasi-sysroot/include` directory into per-target directories. Eventually, we'll want to build a separate sysroot for each target, but there's currently uncertainty about how to configure the default sysroot for e.g. clang, so we're not tackling that yet. See also #447 for further details. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
11 months ago
$(WASM_TOOLS): | $(DOWNDIR)
wget --no-clobber --directory-prefix=$(DOWNDIR) $(WASM_TOOLS_URL)
tar --extract --file=$(DOWNDIR)/$(shell basename $(WASM_TOOLS_URL)) --directory=$(DOWNDIR)/
$(ADAPTER): | $(DOWNDIR)
wget --no-clobber --directory-prefix=$(DOWNDIR) $(ADAPTER_URL)
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
clean::
rm -rf download
##### BUILD ####################################################################
# For now, we list out the tests that we can currently build and run. This is
# heavily focused on the functional tests; in the future it would be good to
# fill out the missing tests and also include some `src/api` and `src/math`
# tests (TODO).
TESTS := \
$(LIBC_TEST)/src/functional/argv.c \
$(LIBC_TEST)/src/functional/basename.c \
$(LIBC_TEST)/src/functional/clocale_mbfuncs.c \
$(LIBC_TEST)/src/functional/clock_gettime.c \
$(LIBC_TEST)/src/functional/crypt.c \
$(LIBC_TEST)/src/functional/dirname.c \
$(LIBC_TEST)/src/functional/env.c \
$(LIBC_TEST)/src/functional/fnmatch.c \
$(LIBC_TEST)/src/functional/iconv_open.c \
$(LIBC_TEST)/src/functional/mbc.c \
$(LIBC_TEST)/src/functional/memstream.c \
$(LIBC_TEST)/src/functional/qsort.c \
$(LIBC_TEST)/src/functional/random.c \
$(LIBC_TEST)/src/functional/search_hsearch.c \
$(LIBC_TEST)/src/functional/search_insque.c \
$(LIBC_TEST)/src/functional/search_lsearch.c \
$(LIBC_TEST)/src/functional/search_tsearch.c \
$(LIBC_TEST)/src/functional/snprintf.c \
$(LIBC_TEST)/src/functional/sscanf.c \
$(LIBC_TEST)/src/functional/strftime.c \
$(LIBC_TEST)/src/functional/string.c \
$(LIBC_TEST)/src/functional/string_memcpy.c \
$(LIBC_TEST)/src/functional/string_memmem.c \
$(LIBC_TEST)/src/functional/string_memset.c \
$(LIBC_TEST)/src/functional/string_strchr.c \
$(LIBC_TEST)/src/functional/string_strcspn.c \
$(LIBC_TEST)/src/functional/string_strstr.c \
$(LIBC_TEST)/src/functional/strtod.c \
$(LIBC_TEST)/src/functional/strtod_long.c \
$(LIBC_TEST)/src/functional/strtod_simple.c \
$(LIBC_TEST)/src/functional/strtof.c \
$(LIBC_TEST)/src/functional/strtol.c \
$(LIBC_TEST)/src/functional/swprintf.c \
$(LIBC_TEST)/src/functional/tgmath.c \
$(LIBC_TEST)/src/functional/udiv.c \
$(LIBC_TEST)/src/functional/wcsstr.c \
$(LIBC_TEST)/src/functional/wcstol.c
# Part of the problem including more tests is that the `libc-test`
# infrastructure code is not all Wasm-compilable. As we include more tests
# above, this list will also likely need to grow.
COMMON_TEST_INFRA = \
$(LIBC_TEST)/src/common/path.c \
$(LIBC_TEST)/src/common/print.c \
$(LIBC_TEST)/src/common/rand.c \
$(LIBC_TEST)/src/common/utf8.c
# Create various lists containing the various artifacts to be built: mainly,
# $(WASM_OBJS) are compiled in the $(OBJDIRS) and then linked together to form
# the $(WASMS) tests.
NAMES := $(TESTS:$(LIBC_TEST)/src/%.c=%)
Update bindings and dependencies to WASI 0.2.0 (#471) * 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>
9 months ago
WASMS := $(TESTS:$(LIBC_TEST)/src/%.c=$(OBJDIR)/%.core.wasm)
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
WASM_OBJS := $(TESTS:$(LIBC_TEST)/src/%.c=$(OBJDIR)/%.wasm.o)
INFRA_WASM_OBJS := $(COMMON_TEST_INFRA:$(LIBC_TEST)/src/%.c=$(OBJDIR)/%.wasm.o)
WASM_OBJS += $(INFRA_WASM_OBJS)
DIRS := $(patsubst $(OBJDIR)/%/,%,$(sort $(dir $(WASM_OBJS))))
OBJDIRS := $(DIRS:%=$(OBJDIR)/%)
# Allow $(CC) to be set from the command line; ?= doesn't work for CC because
# make has a default value for it.
ifeq ($(origin CC), default)
CC := clang
endif
LDFLAGS ?=
add `wasm32-wasi-preview2` target (#457) Currently, this is identical to the `wasm32-wasi` in all but name. See #449 for the next step, which is to incrementally add Preview 2 features, e.g. `wasi-sockets`. Per the discussion in that PR, I've split the `wasi-sysroot/include` directory into per-target directories. Eventually, we'll want to build a separate sysroot for each target, but there's currently uncertainty about how to configure the default sysroot for e.g. clang, so we're not tackling that yet. See also #447 for further details. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
11 months ago
CFLAGS ?= --target=$(TARGET_TRIPLE) --sysroot=../sysroot
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
# Always include the `libc-test` infrastructure headers.
CFLAGS += -I$(LIBC_TEST)/src/common
Start renaming preview1 to p1 and preview2 to p2 (#478) * Start renaming preview1 to p1 and preview2 to p2 This is an initial start at renaming the "preview" terminology in WASI targets to "pX". For example the `wasm32-wasi` target should transition to `wasm32-wasip1`, `wasm32-wasi-preview2` should transition to `wasm32-wasip2`, and `wasm32-wasi-threads` should transition to `wasm32-wasip1-threads`. This commit applies a few renames in the `Makefile` such as: * `WASI_SNAPSHOT` is now either "p1" or "p2" * The default p2 target triple is now `wasm32-wasip2` instead of `wasm32-wasi-preview2` (in the hopes that it's early enough to change the default). * Bindings for WASIp2 were renamed from "preview2" terminology to "wasip2". * The expected-defines files are renamed and the logic of which expectation was used has been updated slightly. With this commit the intention is that non-preview2 defaults do not change. For example the default build still produces a `wasm32-wasi` sysroot. If `TARGET_TRIPLE=wasm32-wasip1` is passed, however, then that sysroot is produced instead. Similarly a `THREAD_MODEL=posix` build produces a `wasm32-wasi-threads` sysroot target but you can now also pass `TARGET_TRIPLE=wasm32-wasip1-threads` to rename the sysroot. My hope is to integrate this into the wasi-sdk repository and build a dual sysroot for these new targets for a release or two so both are supported and then in the future the defaults can be switched away from `wasm32-wasi` to `wasm32-wasip1` as built-by-default. * Update builds in CI * Update test workflow * Fix test for wasm32-wasip1-threads * Make github actions rules a bit more readable
8 months ago
ifneq ($(findstring -threads,$(TARGET_TRIPLE)),)
add WASI Preview 2 bindings (#460) * add WASI Preview 2 bindings This adds C bindings generated from the `wasi:cli/imports@0.2.0-rc-2023-12-05` world, plus a makefile target to regenerate them from the WIT source files. We'll use these bindings to call Preview 2 host functions when building for the `wasm32-wasi-preview2` target. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * update to pre-release of `wit-bindgen` 0.17.0 This includes https://github.com/bytecodealliance/wit-bindgen/pull/804 (fix broken indentation in generated code) and https://github.com/bytecodealliance/wit-bindgen/pull/805 (support overriding world name and adding a suffix to the component type custom section). Signed-off-by: Joel Dice <joel.dice@fermyon.com> * test all targets; update preview2 expected output files Signed-off-by: Joel Dice <joel.dice@fermyon.com> * build for `wasm32-wasi-threads` before testing it Signed-off-by: Joel Dice <joel.dice@fermyon.com> * move generated bindings per review feedback Since these files aren't part of cloudlibc, no reason to put them under the cloudlibc directory. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * move preview2.h to wasi directory Signed-off-by: Joel Dice <joel.dice@fermyon.com> --------- Signed-off-by: Joel Dice <joel.dice@fermyon.com>
10 months ago
CFLAGS += -pthread
endif
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang's runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
# Compile each selected test using Clang. Note that failures here are likely
# due to a missing `libclang_rt.builtins-wasm32.a` in the Clang lib directory.
# This location is system-dependent, but could be fixed by something like:
# $ sudo mkdir /usr/lib64/clang/14.0.5/lib/wasi
# $ sudo cp download/lib/wasi/libclang_rt.builtins-wasm32.a /usr/lib64/clang/14.0.5/lib/wasi/
build: download $(WASMS)
$(WASMS): | $(OBJDIRS)
Update bindings and dependencies to WASI 0.2.0 (#471) * 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>
9 months ago
$(OBJDIR)/%.core.wasm: $(OBJDIR)/%.wasm.o $(INFRA_WASM_OBJS)
add `wasm32-wasi-preview2` target (#457) Currently, this is identical to the `wasm32-wasi` in all but name. See #449 for the next step, which is to incrementally add Preview 2 features, e.g. `wasi-sockets`. Per the discussion in that PR, I've split the `wasi-sysroot/include` directory into per-target directories. Eventually, we'll want to build a separate sysroot for each target, but there's currently uncertainty about how to configure the default sysroot for e.g. clang, so we're not tackling that yet. See also #447 for further details. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
11 months ago
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
Update bindings and dependencies to WASI 0.2.0 (#471) * 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>
9 months ago
add WASI Preview 2 bindings (#460) * add WASI Preview 2 bindings This adds C bindings generated from the `wasi:cli/imports@0.2.0-rc-2023-12-05` world, plus a makefile target to regenerate them from the WIT source files. We'll use these bindings to call Preview 2 host functions when building for the `wasm32-wasi-preview2` target. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * update to pre-release of `wit-bindgen` 0.17.0 This includes https://github.com/bytecodealliance/wit-bindgen/pull/804 (fix broken indentation in generated code) and https://github.com/bytecodealliance/wit-bindgen/pull/805 (support overriding world name and adding a suffix to the component type custom section). Signed-off-by: Joel Dice <joel.dice@fermyon.com> * test all targets; update preview2 expected output files Signed-off-by: Joel Dice <joel.dice@fermyon.com> * build for `wasm32-wasi-threads` before testing it Signed-off-by: Joel Dice <joel.dice@fermyon.com> * move generated bindings per review feedback Since these files aren't part of cloudlibc, no reason to put them under the cloudlibc directory. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * move preview2.h to wasi directory Signed-off-by: Joel Dice <joel.dice@fermyon.com> --------- Signed-off-by: Joel Dice <joel.dice@fermyon.com>
10 months ago
ifeq ($(TARGET_TRIPLE), wasm32-wasi-preview2)
Update bindings and dependencies to WASI 0.2.0 (#471) * 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>
9 months ago
$(OBJDIR)/%.wasm: $(OBJDIR)/%.core.wasm
$(WASM_TOOLS) component new --adapt $(ADAPTER) $< -o $@
add `wasm32-wasi-preview2` target (#457) Currently, this is identical to the `wasm32-wasi` in all but name. See #449 for the next step, which is to incrementally add Preview 2 features, e.g. `wasi-sockets`. Per the discussion in that PR, I&#39;ve split the `wasi-sysroot/include` directory into per-target directories. Eventually, we&#39;ll want to build a separate sysroot for each target, but there&#39;s currently uncertainty about how to configure the default sysroot for e.g. clang, so we&#39;re not tackling that yet. See also #447 for further details. Signed-off-by: Joel Dice &lt;joel.dice@fermyon.com&gt;
11 months ago
endif
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang&#39;s runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
$(WASM_OBJS): $(LIBC_TEST)/src/common/test.h | $(OBJDIRS)
$(OBJDIR)/%.wasm.o: $(LIBC_TEST)/src/%.c
Start renaming preview1 to p1 and preview2 to p2 (#478) * Start renaming preview1 to p1 and preview2 to p2 This is an initial start at renaming the &#34;preview&#34; terminology in WASI targets to &#34;pX&#34;. For example the `wasm32-wasi` target should transition to `wasm32-wasip1`, `wasm32-wasi-preview2` should transition to `wasm32-wasip2`, and `wasm32-wasi-threads` should transition to `wasm32-wasip1-threads`. This commit applies a few renames in the `Makefile` such as: * `WASI_SNAPSHOT` is now either &#34;p1&#34; or &#34;p2&#34; * The default p2 target triple is now `wasm32-wasip2` instead of `wasm32-wasi-preview2` (in the hopes that it&#39;s early enough to change the default). * Bindings for WASIp2 were renamed from &#34;preview2&#34; terminology to &#34;wasip2&#34;. * The expected-defines files are renamed and the logic of which expectation was used has been updated slightly. With this commit the intention is that non-preview2 defaults do not change. For example the default build still produces a `wasm32-wasi` sysroot. If `TARGET_TRIPLE=wasm32-wasip1` is passed, however, then that sysroot is produced instead. Similarly a `THREAD_MODEL=posix` build produces a `wasm32-wasi-threads` sysroot target but you can now also pass `TARGET_TRIPLE=wasm32-wasip1-threads` to rename the sysroot. My hope is to integrate this into the wasi-sdk repository and build a dual sysroot for these new targets for a release or two so both are supported and then in the future the defaults can be switched away from `wasm32-wasi` to `wasm32-wasip1` as built-by-default. * Update builds in CI * Update test workflow * Fix test for wasm32-wasip1-threads * Make github actions rules a bit more readable
8 months ago
$(CC) $(CFLAGS) -c -o $@ $<
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang&#39;s runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
$(OBJDIRS):
mkdir -p $@
clean::
rm -rf $(OBJDIR)
##### RUN ######################################################################
ENGINE ?= $(WASMTIME) run
Update bindings and dependencies to WASI 0.2.0 (#471) * make the Makefiles a bit more robust - Escape &#34;.&#34; 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 &lt;joel.dice@fermyon.com&gt; * 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 &lt;joel.dice@fermyon.com&gt; --------- Signed-off-by: Joel Dice &lt;joel.dice@fermyon.com&gt;
9 months ago
ERRS:=$(WASMS:%.core.wasm=%.wasm.err)
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang&#39;s runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
# Use the provided Wasm engine to execute each test, emitting its output into
# a `.err` file.
run: build $(ERRS)
@echo "Tests passed"
$(ERRS): | $(OBJDIRS)
Update bindings and dependencies to WASI 0.2.0 (#471) * make the Makefiles a bit more robust - Escape &#34;.&#34; 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 &lt;joel.dice@fermyon.com&gt; * 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 &lt;joel.dice@fermyon.com&gt; --------- Signed-off-by: Joel Dice &lt;joel.dice@fermyon.com&gt;
9 months ago
ifeq ($(TARGET_TRIPLE), wasm32-wasi-preview2)
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang&#39;s runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
%.wasm.err: %.wasm
Update bindings and dependencies to WASI 0.2.0 (#471) * make the Makefiles a bit more robust - Escape &#34;.&#34; 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 &lt;joel.dice@fermyon.com&gt; * 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 &lt;joel.dice@fermyon.com&gt; --------- Signed-off-by: Joel Dice &lt;joel.dice@fermyon.com&gt;
9 months ago
$(ENGINE) --wasm component-model $< >$@
else
%.wasm.err: %.core.wasm
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang&#39;s runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
$(ENGINE) $< >$@
Update bindings and dependencies to WASI 0.2.0 (#471) * make the Makefiles a bit more robust - Escape &#34;.&#34; 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 &lt;joel.dice@fermyon.com&gt; * 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 &lt;joel.dice@fermyon.com&gt; --------- Signed-off-by: Joel Dice &lt;joel.dice@fermyon.com&gt;
9 months ago
endif
test: run a subset of tests using `libc-test` (#346) * test: run a subset of tests from `libc-test` This change introduces a `test` directory that retrieves the `libc-test` suite, compiles a subset of the tests using `wasi-libc`, and runs them with Wasmtime. * ci: run tests during CI This change includes some fixups to the filesystem to place Clang&#39;s runtime library for `wasm32-wasi` in the right location. Note that this CI action is limited to a single OS--Linux.
2 years ago
clean::
rm -rf $(OBJDIR)/*/*.err
##### MISC #####################################################################
# Note: the `clean` target has been built up by all of the previous sections.
debug:
@echo NAMES $(NAMES)
@echo TESTS $(TESTS)
@echo WASMS $(WASMS)
@echo WASM_OBJS $(WASM_OBJS)
@echo ERRS $(ERRS)
@echo DIRS $(DIRS)
@echo OBJDIRS $(OBJDIRS)
.PHONY: test download build run clean