Skip to contentSkip to conversation

wasm: Enable 64bit guests on TCI using wasm64

PATCH Superseded Kohei Tokunaga 3 participants 9 messages Aug 6, 2025 – Aug 7, 2025 Arm/Amlogic Meson SoC support

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover wasm: Enable 64bit guests on TCI using wasm64

V2:

- Added a link to the Emscripten documentation about -sMEMORY64 in the configure script.
- Changed --wasm64-memory64 flag to --wasm64-32bit-address-limit to avoid exposing the -sMEMORY64 value directly to the users.
- Fixed GitLab CI to use --wasm64-32bit-address-limit instead of --wasm64-memory64.

V1:

This patch series enables the TCI of the Wasm build to run 64bit guests. Unlike the previous series[1], this patch series is implemented by adding support for WebAssembly's "wasm64" target which enables 64bit pointers.

In the previous discussion[2], the main challenge of using wasm64 was its limited adoption, particularly the lack of support in our dependency (libffi) and some engines such as Safari.

For libffi, I've completed the addition of wasm64 support upstream[3] so it can be used.

To support wasm32 engines, this patch uses Emscripten's compatibility feature, -sMEMORY64=2 flag[4]. This flag still enables 64bit pointers in the C code while Emscripten lowers the output binary to wasm32 and limits the maximum memory size to 4GB. As a result, QEMU can run on wasm32 engiens while still supporting 64bit guests.

# Overview of the build process

To compile QEMU with Emscripten, the following dependencies are required. The emsdk-wasm-cross.docker environment includes all necessary components and can be used as the build environment:

- Emscripten SDK (emsdk) v4.0.10
- Libraries cross-compiled with Emscripten (please see also emsdk-wasm-cross.docker for build steps)
- GLib v2.84.0
- zlib v1.3.1
- libffi v3.5.2
- Pixman v0.44.2

The configure script supports --cpu=wasm64 flag to compile QEMU with 64bit pointer support.

emconfigure ./configure --cpu=wasm64 \
                        --static --disable-tools \
                        --target-list=x86_64-softmmu \
                        --enable-tcg-interpreter

emmake make -j$(nproc)

If the output needs to run on wasm32 engines, use --wasm64-32bit-address-limit flag. This flag enables Emscripten's -sMEMORY64=2 flag[4]. (Note: --wasm64-memory64=2 flag in the V1 patch has been renamed to --wasm64-32bit-address-limit in V2)

emconfigure ./configure --cpu=wasm64 --wasm64-32bit-address-limit \
                        --static --disable-tools \
                        --target-list=x86_64-softmmu \
                        --enable-tcg-interpreter

emmake make -j$(nproc)

Either of the above commands generates the following files:

- qemu-system-x86_64.js
- qemu-system-x86_64.wasm

Guest images can be packaged using Emscripten's file_packager.py tool. For example, if the images are stored in a directory named "pack", the following command packages them, allowing QEMU to access them through Emscripten's virtual filesystem:

/path/to/file_packager.py qemu-system-x86_64.data --preload pack > load.js

This process generates the following files:

- qemu-system-x86_64.data
- load.js

Emscripten allows passing arguments to the QEMU command via the Module object in JavaScript:

Module['arguments'] = [

    '-nographic', '-m', '512M',
    '-L', 'pack/',
    '-drive', 'if=virtio,format=raw,file=pack/rootfs.bin',
    '-kernel', 'pack/bzImage',
    '-append', 'earlyprintk=ttyS0 console=ttyS0 root=/dev/vda loglevel=7',

];

The sample repository[5] (tcidev64 branch) provides a complete setup, including an HTML file that implements a terminal UI.

[1] https://lists.nongnu.org/archive/html/qemu-devel/2025-05/msg05376.html
[2] https://lists.nongnu.org/archive/html/qemu-devel/2025-04/msg01795.html
[3] https://github.com/libffi/libffi/pull/927
[4] https://emscripten.org/docs/tools_reference/settings_reference.html#memory64
[5] https://github.com/ktock/qemu-wasm-sample/tree/tcidev64

Kohei Tokunaga (4):
meson: Add wasm64 support to the --cpu flag
configure: Enable to propagate -sMEMORY64 flag to Emscripten
dockerfiles: Add support for wasm64 to the wasm Dockerfile .gitlab-ci.d: Add build tests for wasm64

 .gitlab-ci.d/buildtest.yml                    | 24 +++++++++++++--
 .gitlab-ci.d/container-cross.yml              | 18 +++++++++++-
 .gitlab-ci.d/container-template.yml           |  4 ++-
 MAINTAINERS                                   |  2 +-
 configure                                     | 16 +++++++++-
 meson.build                                   |  4 +--
 ...2-cross.docker => emsdk-wasm-cross.docker} | 29 ++++++++++++++-----
 7 files changed, 81 insertions(+), 16 deletions(-)
 rename tests/docker/dockerfiles/{emsdk-wasm32-cross.docker => emsdk-wasm-cross.docker} (85%)
Signature · 1 line
2.43.0
#1 lore raw

PATCH v2 1/4 meson: Add wasm64 support to the --cpu flag

wasm64 target enables 64bit pointers using Emscripten's -sMEMORY64=1 flag[1]. This enables QEMU to run 64bit guests.

Although the configure script uses "uname -m" as the fallback value when "cpu" is empty, this can't be used for Emscripten which targets to Wasm. So, in wasm build, this commit fixes configure to require --cpu flag to be explicitly specified by the user.

[1] https://emscripten.org/docs/tools_reference/settings_reference.html#memory64

---
 configure   | 6 +++++-
 meson.build | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
configure +5 -1
index 825057ebf1..7f3893a42f 100755
@@ -365,7 +365,6 @@ elif check_define __APPLE__; then
   host_os=darwin
 elif check_define EMSCRIPTEN ; then
   host_os=emscripten
-  cpu=wasm32
   cross_compile="yes"
 else
   # This is a fatal error, but don't report it yet, because we
@@ -425,6 +424,8 @@ elif check_define __aarch64__ ; then
   cpu="aarch64"
 elif check_define __loongarch64 ; then
   cpu="loongarch64"
+elif check_define EMSCRIPTEN ; then
+  error_exit "wasm32 or wasm64 must be specified to the cpu flag"
 else
   # Using uname is really broken, but it is just a fallback for architectures
   # that are going to use TCI anyway
@@ -535,6 +536,9 @@ case "$cpu" in
   wasm32)
     CPU_CFLAGS="-m32"
     ;;
+  wasm64)
+    CPU_CFLAGS="-m64 -sMEMORY64=1"
+    ;;
 esac
 
 if test -n "$host_arch" && {
meson.build +2 -2
index e53cd5b413..291fe3f0d0 100644
@@ -52,7 +52,7 @@ qapi_trace_events = []
 bsd_oses = ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly', 'darwin']
 supported_oses = ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', 'sunos', 'linux', 'emscripten']
 supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', 'x86_64',
-  'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc64', 'wasm32']
+  'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc64', 'wasm32', 'wasm64']
 
 cpu = host_machine.cpu_family()
 
@@ -916,7 +916,7 @@ if have_tcg
     if not get_option('tcg_interpreter')
       error('Unsupported CPU @0@, try --enable-tcg-interpreter'.format(cpu))
     endif
-  elif host_arch == 'wasm32'
+  elif host_arch == 'wasm32' or host_arch == 'wasm64'
     if not get_option('tcg_interpreter')
       error('WebAssembly host requires --enable-tcg-interpreter')
     endif
Signature · 1 line
2.43.0
#2 lore raw

PATCH v2 2/4 configure: Enable to propagate -sMEMORY64 flag to Emscripten

In reply to Kohei Tokunaga

Currently there are some engines that don't support wasm64 (e.g. unsupported on Safari[1]). To mitigate this issue, the configure script allows the user to use Emscripten's compatibility feature, "-sMEMORY64=2" flag[2].

Emscripten's "-sMEMORY64=2" flag still enables 64bit pointers in C code. But this flag lowers the output binary into wasm32, with limiting the maximum memory size to 4GB. So QEMU can run on wasm32 engines.

[1] https://webassembly.org/features/
[2] https://emscripten.org/docs/tools_reference/settings_reference.html#memory64

---
 configure | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

V2:
- Changed --wasm64-memory64 flag to --wasm64-32bit-address-limit to avoid exposing the -sMEMORY64 value directly to the users. This can be considered as a significant change from the previous version of this patch so the Reviewed-by tag has been removed.
- Added a link to the Emscripten documentation about -sMEMORY64 in the configure script.

configure +11 -1
index 7f3893a42f..0587577da9 100755
@@ -182,6 +182,10 @@ EXTRA_CXXFLAGS=""
 EXTRA_OBJCFLAGS=""
 EXTRA_LDFLAGS=""
 
+# The value is propagated to Emscripten's "-sMEMORY64" flag.
+# https://emscripten.org/docs/tools_reference/settings_reference.html#memory64
+wasm64_memory64=1
+
 # Default value for a variable defining feature "foo".
 #  * foo="no"  feature will only be used if --enable-foo arg is given
 #  * foo=""    feature will be searched for, and if found, will be used
@@ -239,6 +243,8 @@ for opt do
   ;;
   --without-default-features) default_feature="no"
   ;;
+  --wasm64-32bit-address-limit) wasm64_memory64="2"
+  ;;
   esac
 done
 
@@ -537,7 +543,7 @@ case "$cpu" in
     CPU_CFLAGS="-m32"
     ;;
   wasm64)
-    CPU_CFLAGS="-m64 -sMEMORY64=1"
+    CPU_CFLAGS="-m64 -sMEMORY64=$wasm64_memory64"
     ;;
 esac
 
@@ -795,6 +801,8 @@ for opt do
   ;;
   --disable-rust) rust=disabled
   ;;
+  --wasm64-32bit-address-limit)
+  ;;
   # everything else has the same name in configure and meson
   --*) meson_option_parse "$opt" "$optarg"
   ;;
@@ -920,6 +928,8 @@ Advanced options (experts only):
   --disable-containers     don't use containers for cross-building
   --container-engine=TYPE  which container engine to use [$container_engine]
   --gdb=GDB-path           gdb to use for gdbstub tests [$gdb_bin]
+  --wasm64-32bit-address-limit Restrict wasm64 address space to 32-bit (default
+                               is to use the whole 64-bit range).
 EOF
   meson_options_help
 cat << EOF
Signature · 1 line
2.43.0
Reviewed-by on v2 2/4
#3 lore raw

Re: [PATCH v2 2/4] configure: Enable to propagate -sMEMORY64 flag to Emscripten

Quoted 8 lines · Kohei Tokunaga

Currently there are some engines that don't support wasm64 (e.g. unsupported on Safari[1]). To mitigate this issue, the configure script allows the user to use Emscripten's compatibility feature, "-sMEMORY64=2" flag[2].

Emscripten's "-sMEMORY64=2" flag still enables 64bit pointers in C code. But this flag lowers the output binary into wasm32, with limiting the maximum memory size to 4GB. So QEMU can run on wasm32 engines.

Quoted 7 lines

[1] https://webassembly.org/features/
[2] https://emscripten.org/docs/tools_reference/settings_reference.html#memory64

---
  configure | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
Reviewed-by on v2 2/4
#4 lore raw

Re: [PATCH v2 2/4] configure: Enable to propagate -sMEMORY64 flag to Emscripten

In reply to Kohei Tokunaga
Quoted 16 lines · Kohei Tokunaga

Currently there are some engines that don't support wasm64 (e.g. unsupported on Safari[1]). To mitigate this issue, the configure script allows the user to use Emscripten's compatibility feature, "-sMEMORY64=2" flag[2].

Emscripten's "-sMEMORY64=2" flag still enables 64bit pointers in C code. But this flag lowers the output binary into wasm32, with limiting the maximum memory size to 4GB. So QEMU can run on wasm32 engines.

[1] https://webassembly.org/features/
[2] https://emscripten.org/docs/tools_reference/settings_reference.html#memory64

---
  configure | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
Quoted 8 lines

V2:
- Changed --wasm64-memory64 flag to --wasm64-32bit-address-limit to avoid exposing the -sMEMORY64 value directly to the users. This can be considered as a significant change from the previous version of this patch so the Reviewed-by tag has been removed.
- Added a link to the Emscripten documentation about -sMEMORY64 in the configure script.

Thanks for the update,

#5 lore raw

PATCH v2 3/4 dockerfiles: Add support for wasm64 to the wasm Dockerfile

In reply to Kohei Tokunaga

This commit fixes Dockerfile of the wasm build to support both of wasm32 and wasm64 build. Dockerfile takes the following build arguments and use these values for building dependencies.

- TARGET_CPU: target wasm arch (wasm32 or wasm64)
- WASM64_MEMORY64: target -sMEMORY64 mode (1 or 2)

---
 MAINTAINERS                                   |  2 +-
 ...2-cross.docker => emsdk-wasm-cross.docker} | 29 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)
 rename tests/docker/dockerfiles/{emsdk-wasm32-cross.docker => emsdk-wasm-cross.docker} (85%)
MAINTAINERS +1 -1
index a07086ed76..433a44118d 100644
@@ -647,7 +647,7 @@ F: include/system/os-wasm.h
 F: os-wasm.c
 F: util/coroutine-wasm.c
 F: configs/meson/emscripten.txt
-F: tests/docker/dockerfiles/emsdk-wasm32-cross.docker
+F: tests/docker/dockerfiles/emsdk-wasm-cross.docker
 
 Alpha Machines
 --------------
tests/docker/dockerfiles/emsdk-wasm-cross.docker renamed from tests/docker/dockerfiles/emsdk-wasm32-cross.docker +22 -7
similarity index 85%
rename from tests/docker/dockerfiles/emsdk-wasm32-cross.docker
rename to tests/docker/dockerfiles/emsdk-wasm-cross.docker
index 60a7d02f56..4b41be62ab 100644
@@ -1,14 +1,17 @@
 # syntax = docker/dockerfile:1.5
 
-ARG EMSDK_VERSION_QEMU=3.1.50
+ARG EMSDK_VERSION_QEMU=4.0.10
 ARG ZLIB_VERSION=1.3.1
 ARG GLIB_MINOR_VERSION=2.84
 ARG GLIB_VERSION=${GLIB_MINOR_VERSION}.0
 ARG PIXMAN_VERSION=0.44.2
-ARG FFI_VERSION=v3.4.7
+ARG FFI_VERSION=v3.5.2
 ARG MESON_VERSION=1.5.0
+ARG TARGET_CPU=wasm32
+ARG WASM64_MEMORY64=0
 
-FROM emscripten/emsdk:$EMSDK_VERSION_QEMU AS build-base
+FROM emscripten/emsdk:$EMSDK_VERSION_QEMU AS build-base-common
+ARG TARGET_CPU
 ARG MESON_VERSION
 ENV TARGET=/builddeps/target
 ENV CPATH="$TARGET/include"
@@ -33,8 +36,8 @@ RUN <<EOF
 cat <<EOT > /cross.meson
 [host_machine]
 system = 'emscripten'
-cpu_family = 'wasm32'
-cpu = 'wasm32'
+cpu_family = '${TARGET_CPU}'
+cpu = '${TARGET_CPU}'
 endian = 'little'
 
 [binaries]
@@ -46,6 +49,16 @@ pkgconfig = ['pkg-config', '--static']
 EOT
 EOF
 
+FROM build-base-common AS build-base-wasm32
+
+FROM build-base-common AS build-base-wasm64
+ARG WASM64_MEMORY64
+ENV CFLAGS="$CFLAGS -sMEMORY64=${WASM64_MEMORY64}"
+ENV CXXFLAGS="$CXXFLAGS -sMEMORY64=${WASM64_MEMORY64}"
+ENV LDFLAGS="$LDFLAGS -sMEMORY64=${WASM64_MEMORY64}"
+
+FROM build-base-${TARGET_CPU} AS build-base
+
 FROM build-base AS zlib-dev
 ARG ZLIB_VERSION
 RUN mkdir -p /zlib
@@ -56,17 +69,19 @@ RUN emconfigure ./configure --prefix=$TARGET --static
 RUN emmake make install -j$(nproc)
 
 FROM build-base AS libffi-dev
+ARG TARGET_CPU
+ARG WASM64_MEMORY64
 ARG FFI_VERSION
 RUN mkdir -p /libffi
 RUN git clone https://github.com/libffi/libffi /libffi
 WORKDIR /libffi
 RUN git checkout $FFI_VERSION
 RUN autoreconf -fiv
-RUN emconfigure ./configure --host=wasm32-unknown-linux \
+RUN emconfigure ./configure --host=${TARGET_CPU}-unknown-linux \
     --prefix=$TARGET --enable-static \
     --disable-shared --disable-dependency-tracking \
     --disable-builddir --disable-multi-os-directory \
-    --disable-raw-api --disable-docs
+    --disable-raw-api --disable-docs WASM64_MEMORY64=${WASM64_MEMORY64}
 RUN emmake make install SUBDIRS='include' -j$(nproc)
 
 FROM build-base AS pixman-dev
Signature · 1 line
2.43.0
#6 lore raw

PATCH v2 4/4 .gitlab-ci.d: Add build tests for wasm64

In reply to Kohei Tokunaga

The wasm builds are tested for 3 targets: wasm32, wasm64(-sMEMORY64=1) and wasm64(-sMEMORY64=2). The CI builds the containers using the same Dockerfile (emsdk-wasm-cross.docker) with different build args.

---
 .gitlab-ci.d/buildtest.yml          | 24 +++++++++++++++++++++---
 .gitlab-ci.d/container-cross.yml    | 18 +++++++++++++++++-
 .gitlab-ci.d/container-template.yml |  4 +++-
 3 files changed, 41 insertions(+), 5 deletions(-)

V2:
- Fixed to use --wasm64-32bit-address-limit instead of the removed --wasm64-memory64. This can be considered as a significant change from the previous version of this patch so the Reviewed-by tag has been removed.

.gitlab-ci.d/buildtest.yml +21 -3
index d888a60063..0dded04188 100644
@@ -787,11 +787,29 @@ coverity:
     # Always manual on forks even if $QEMU_CI == "2"
     - when: manual
 
-build-wasm:
+build-wasm32:
   extends: .wasm_build_job_template
   timeout: 2h
   needs:
-    job: wasm-emsdk-cross-container
+    job: wasm32-emsdk-cross-container
   variables:
     IMAGE: emsdk-wasm32-cross
-    CONFIGURE_ARGS: --static --disable-tools --enable-debug --enable-tcg-interpreter
+    CONFIGURE_ARGS: --static --cpu=wasm32 --disable-tools --enable-debug --enable-tcg-interpreter
+
+build-wasm-wasm64:
+  extends: .wasm_build_job_template
+  timeout: 2h
+  needs:
+    job: wasm64-emsdk-cross-container
+  variables:
+    IMAGE: emsdk-wasm64-cross
+    CONFIGURE_ARGS: --static --cpu=wasm64 --disable-tools --enable-debug --enable-tcg-interpreter
+
+build-wasm-wasm64l:
+  extends: .wasm_build_job_template
+  timeout: 2h
+  needs:
+    job: wasm64l-emsdk-cross-container
+  variables:
+    IMAGE: emsdk-wasm64l-cross
+    CONFIGURE_ARGS: --static --cpu=wasm64 --wasm64-32bit-address-limit --disable-tools --enable-debug --enable-tcg-interpreter
.gitlab-ci.d/container-cross.yml +17 -1
index 8d3be53b75..1bacaff818 100644
@@ -92,7 +92,23 @@ win64-fedora-cross-container:
   variables:
     NAME: fedora-win64-cross
 
-wasm-emsdk-cross-container:
+wasm32-emsdk-cross-container:
   extends: .container_job_template
   variables:
     NAME: emsdk-wasm32-cross
+    BUILD_ARGS: --build-arg TARGET_CPU=wasm32
+    DOCKERFILE: emsdk-wasm-cross
+
+wasm64-emsdk-cross-container:
+  extends: .container_job_template
+  variables:
+    NAME: emsdk-wasm64-cross
+    BUILD_ARGS: --build-arg TARGET_CPU=wasm64 --build-arg WASM64_MEMORY64=1
+    DOCKERFILE: emsdk-wasm-cross
+
+wasm64l-emsdk-cross-container:
+  extends: .container_job_template
+  variables:
+    NAME: emsdk-wasm64l-cross
+    BUILD_ARGS: --build-arg TARGET_CPU=wasm64 --build-arg WASM64_MEMORY64=2
+    DOCKERFILE: emsdk-wasm-cross
.gitlab-ci.d/container-template.yml +3 -1
index 4eec72f383..01ca840413 100644
@@ -10,12 +10,14 @@
     - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest"
     - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
     - until docker info; do sleep 1; done
+    - export DOCKERFILE_NAME=${DOCKERFILE:-$NAME}
   script:
     - echo "TAG:$TAG"
     - echo "COMMON_TAG:$COMMON_TAG"
     - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_TAG"
       --build-arg BUILDKIT_INLINE_CACHE=1
-      -f "tests/docker/dockerfiles/$NAME.docker" "."
+      $BUILD_ARGS
+      -f "tests/docker/dockerfiles/$DOCKERFILE_NAME.docker" "."
     - docker push "$TAG"
   after_script:
     - docker logout
Signature · 1 line
2.43.0
#7 lore raw

Re: [PATCH v2 4/4] .gitlab-ci.d: Add build tests for wasm64

Quoted 21 lines · Kohei Tokunaga

The wasm builds are tested for 3 targets: wasm32, wasm64(-sMEMORY64=1) and wasm64(-sMEMORY64=2). The CI builds the containers using the same Dockerfile (emsdk-wasm-cross.docker) with different build args.

---
  .gitlab-ci.d/buildtest.yml          | 24 +++++++++++++++++++++---
  .gitlab-ci.d/container-cross.yml    | 18 +++++++++++++++++-
  .gitlab-ci.d/container-template.yml |  4 +++-
  3 files changed, 41 insertions(+), 5 deletions(-)

V2:
- Fixed to use --wasm64-32bit-address-limit instead of the removed --wasm64-memory64. This can be considered as a significant change from the previous version of this patch so the Reviewed-by tag has been removed.

.gitlab-ci.d/buildtest.yml +0 -0
index d888a60063..0dded04188 100644

.gitlab-ci.d/buildtest.yml coverity: · line 790

Quoted 5 lines
.gitlab-ci.d/buildtest.yml +1 -1
@@ -787,11 +787,29 @@ coverity:
      # Always manual on forks even if $QEMU_CI == "2"
      - when: manual
 
-build-wasm:
+build-wasm32:

OK (or following bellow logic, "build-wasm32-32-bit").

.gitlab-ci.d/buildtest.yml coverity: · line 799

Quoted 11 lines
.gitlab-ci.d/buildtest.yml +4 -2
    extends: .wasm_build_job_template
    timeout: 2h
    needs:
-    job: wasm-emsdk-cross-container
+    job: wasm32-emsdk-cross-container
    variables:
      IMAGE: emsdk-wasm32-cross
-    CONFIGURE_ARGS: --static --disable-tools --enable-debug --enable-tcg-interpreter
+    CONFIGURE_ARGS: --static --cpu=wasm32 --disable-tools --enable-debug --enable-tcg-interpreter
+
+build-wasm-wasm64:

Maybe build-wasm64-64bit?> + extends: .wasm_build_job_template

.gitlab-ci.d/buildtest.yml coverity: · line 808

Quoted 8 lines
.gitlab-ci.d/buildtest.yml +8 -0
+  timeout: 2h
+  needs:
+    job: wasm64-emsdk-cross-container
+  variables:
+    IMAGE: emsdk-wasm64-cross
+    CONFIGURE_ARGS: --static --cpu=wasm64 --disable-tools --enable-debug --enable-tcg-interpreter
+
+build-wasm-wasm64l:

So this one becomes build-wasm64-32bit (or better name, "wasm64[l]" is not easy to distinct and figure out this is the 32-bit AS version.

Quoted 21 lines
.gitlab-ci.d/buildtest.yml +7 -0
+  extends: .wasm_build_job_template
+  timeout: 2h
+  needs:
+    job: wasm64l-emsdk-cross-container
+  variables:
+    IMAGE: emsdk-wasm64l-cross
+    CONFIGURE_ARGS: --static --cpu=wasm64 --wasm64-32bit-address-limit --disable-tools --enable-debug --enable-tcg-interpreter
.gitlab-ci.d/container-cross.yml +2 -1
index 8d3be53b75..1bacaff818 100644
@@ -92,7 +92,23 @@ win64-fedora-cross-container:
    variables:
      NAME: fedora-win64-cross
 
-wasm-emsdk-cross-container:
+wasm32-emsdk-cross-container:
    extends: .container_job_template
    variables:
      NAME: emsdk-wasm32-cross
+    BUILD_ARGS: --build-arg TARGET_CPU=wasm32

.gitlab-ci.d/container-cross.yml win64-fedora-cross-container: · line 109

Quoted 10 lines
.gitlab-ci.d/container-cross.yml +10 -0
+    DOCKERFILE: emsdk-wasm-cross
+
+wasm64-emsdk-cross-container:
+  extends: .container_job_template
+  variables:
+    NAME: emsdk-wasm64-cross
+    BUILD_ARGS: --build-arg TARGET_CPU=wasm64 --build-arg WASM64_MEMORY64=1
+    DOCKERFILE: emsdk-wasm-cross
+
+wasm64l-emsdk-cross-container:

(same comments)

Quoted 15 lines
.gitlab-ci.d/container-cross.yml +5 -0
+  extends: .container_job_template
+  variables:
+    NAME: emsdk-wasm64l-cross
+    BUILD_ARGS: --build-arg TARGET_CPU=wasm64 --build-arg WASM64_MEMORY64=2
+    DOCKERFILE: emsdk-wasm-cross
.gitlab-ci.d/container-template.yml +1 -0
index 4eec72f383..01ca840413 100644
@@ -10,12 +10,14 @@
      - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest"
      - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
      - until docker info; do sleep 1; done
+    - export DOCKERFILE_NAME=${DOCKERFILE:-$NAME}
    script:

.gitlab-ci.d/container-template.yml line 23

Quoted 10 lines
.gitlab-ci.d/container-template.yml +2 -1
      - echo "TAG:$TAG"
      - echo "COMMON_TAG:$COMMON_TAG"
      - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_TAG"
        --build-arg BUILDKIT_INLINE_CACHE=1
-      -f "tests/docker/dockerfiles/$NAME.docker" "."
+      $BUILD_ARGS
+      -f "tests/docker/dockerfiles/$DOCKERFILE_NAME.docker" "."
      - docker push "$TAG"
    after_script:
      - docker logout

Nitpicking about names, otherwise LGTM!

#8 lore raw

Re: [PATCH v2 4/4] .gitlab-ci.d: Add build tests for wasm64

Quoted 2 lines · Kohei Tokunaga
Quoted 1 line

The wasm builds are tested for 3 targets: wasm32, wasm64(-sMEMORY64=1)

and

Quoted 1 line
Quoted 1 line

wasm64(-sMEMORY64=2). The CI builds the containers using the same

Dockerfile

Quoted 9 lines
Quoted 9 lines

(emsdk-wasm-cross.docker) with different build args.

---
  .gitlab-ci.d/buildtest.yml          | 24 +++++++++++++++++++++---
  .gitlab-ci.d/container-cross.yml    | 18 +++++++++++++++++-
  .gitlab-ci.d/container-template.yml |  4 +++-
  3 files changed, 41 insertions(+), 5 deletions(-)
Quoted 3 lines
Quoted 3 lines

V2:
- Fixed to use --wasm64-32bit-address-limit instead of the removed --wasm64-memory64. This can be considered as a significant change

from the

Quoted 1 line
Quoted 1 line

previous version of this patch so the Reviewed-by tag has been

removed.

Quoted 9 lines
Quoted 9 lines
.gitlab-ci.d/buildtest.yml +0 -0
index d888a60063..0dded04188 100644
@@ -787,11 +787,29 @@ coverity:
      # Always manual on forks even if $QEMU_CI == "2"
      - when: manual
 
Quoted 13 lines

.gitlab-ci.d/buildtest.yml coverity: · line 790

Quoted 2 lines
.gitlab-ci.d/buildtest.yml +1 -1
-build-wasm:
+build-wasm32:

OK (or following bellow logic, "build-wasm32-32-bit").

Quoted 8 lines
.gitlab-ci.d/buildtest.yml +1 -2
    extends: .wasm_build_job_template
    timeout: 2h
    needs:
-    job: wasm-emsdk-cross-container
+    job: wasm32-emsdk-cross-container
    variables:
      IMAGE: emsdk-wasm32-cross
-    CONFIGURE_ARGS: --static --disable-tools --enable-debug

--enable-tcg-interpreter

Quoted 1 line

.gitlab-ci.d/buildtest.yml coverity: · line 797

Quoted 1 line
.gitlab-ci.d/buildtest.yml +1 -0
+    CONFIGURE_ARGS: --static --cpu=wasm32 --disable-tools

--enable-debug --enable-tcg-interpreter

Quoted 10 lines

.gitlab-ci.d/buildtest.yml coverity: · line 799

Quoted 2 lines
.gitlab-ci.d/buildtest.yml +2 -0
+
+build-wasm-wasm64:

Maybe build-wasm64-64bit?> + extends: .wasm_build_job_template

Quoted 6 lines
.gitlab-ci.d/buildtest.yml +6 -0
+  timeout: 2h
+  needs:
+    job: wasm64-emsdk-cross-container
+  variables:
+    IMAGE: emsdk-wasm64-cross
+    CONFIGURE_ARGS: --static --cpu=wasm64 --disable-tools

--enable-debug --enable-tcg-interpreter

Quoted 13 lines

.gitlab-ci.d/buildtest.yml coverity: · line 807

Quoted 2 lines
.gitlab-ci.d/buildtest.yml +2 -0
+
+build-wasm-wasm64l:

So this one becomes build-wasm64-32bit (or better name, "wasm64[l]" is not easy to distinct and figure out this is the 32-bit AS version.

Quoted 7 lines
.gitlab-ci.d/buildtest.yml +7 -0
+  extends: .wasm_build_job_template
+  timeout: 2h
+  needs:
+    job: wasm64l-emsdk-cross-container
+  variables:
+    IMAGE: emsdk-wasm64l-cross
+    CONFIGURE_ARGS: --static --cpu=wasm64 --wasm64-32bit-address-limit

--disable-tools --enable-debug --enable-tcg-interpreter

Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

b/.gitlab-ci.d/container-cross.yml

Quoted 7 lines
Quoted 7 lines

index 8d3be53b75..1bacaff818 100644

.gitlab-ci.d/container-cross.yml +0 -0
@@ -92,7 +92,23 @@ win64-fedora-cross-container:
    variables:
      NAME: fedora-win64-cross
 
Quoted 13 lines

.gitlab-ci.d/container-cross.yml win64-fedora-cross-container:

Quoted 13 lines
.gitlab-ci.d/container-cross.yml +9 -1
-wasm-emsdk-cross-container:
+wasm32-emsdk-cross-container:
    extends: .container_job_template
    variables:
      NAME: emsdk-wasm32-cross
+    BUILD_ARGS: --build-arg TARGET_CPU=wasm32
+    DOCKERFILE: emsdk-wasm-cross
+
+wasm64-emsdk-cross-container:
+  extends: .container_job_template
+  variables:
+    NAME: emsdk-wasm64-cross
+    BUILD_ARGS: --build-arg TARGET_CPU=wasm64 --build-arg

WASM64_MEMORY64=1

Quoted 10 lines

.gitlab-ci.d/container-cross.yml win64-fedora-cross-container: · line 109

Quoted 3 lines
.gitlab-ci.d/container-cross.yml +3 -0
+    DOCKERFILE: emsdk-wasm-cross
+
+wasm64l-emsdk-cross-container:

(same comments)

Quoted 4 lines
.gitlab-ci.d/container-cross.yml +4 -0
+  extends: .container_job_template
+  variables:
+    NAME: emsdk-wasm64l-cross
+    BUILD_ARGS: --build-arg TARGET_CPU=wasm64 --build-arg

WASM64_MEMORY64=2

Quoted 2 lines

Review

Quoted 2 lines
.gitlab-ci.d/container-cross.yml +1 -0
+    DOCKERFILE: emsdk-wasm-cross
(quoted diff) +0 -0

b/.gitlab-ci.d/container-template.yml

Quoted 5 lines

.gitlab-ci.d/container-template.yml line 10

Quoted 5 lines

index 4eec72f383..01ca840413 100644

.gitlab-ci.d/container-template.yml +0 -0
@@ -10,12 +10,14 @@
      - export

COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest"

Quoted 1 line

.gitlab-ci.d/container-template.yml line 11

Quoted 1 line
.gitlab-ci.d/container-template.yml +0 -0
      - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p

"$CI_REGISTRY_PASSWORD"

Quoted 6 lines

.gitlab-ci.d/container-template.yml

Quoted 6 lines
.gitlab-ci.d/container-template.yml +1 -0
      - until docker info; do sleep 1; done
+    - export DOCKERFILE_NAME=${DOCKERFILE:-$NAME}
    script:
      - echo "TAG:$TAG"
      - echo "COMMON_TAG:$COMMON_TAG"
      - docker build --tag "$TAG" --cache-from "$TAG" --cache-from

"$COMMON_TAG"

Quoted 8 lines

.gitlab-ci.d/container-template.yml line 23

Quoted 7 lines
.gitlab-ci.d/container-template.yml +2 -1
        --build-arg BUILDKIT_INLINE_CACHE=1
-      -f "tests/docker/dockerfiles/$NAME.docker" "."
+      $BUILD_ARGS
+      -f "tests/docker/dockerfiles/$DOCKERFILE_NAME.docker" "."
      - docker push "$TAG"
    after_script:
      - docker logout

Nitpicking about names, otherwise LGTM!

Hi Philippe,
Thanks for the suggestion. I'll rename them in the next version of the patch series.