From nobody Sun Dec 14 01:38:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1754499933; cv=none; d=zohomail.com; s=zohoarc; b=RMs0XxXy7T15OJJUc4kfPJIp9TOySTMNxQr4FdW/LJxJfy9w+PLuPjZO9AQhB+KjuUrk+himiGexIvCVWtqexkcxF+AZTlvoM+xtYx9oSIHYmxtxNy2i9EYgtPCB+4H4oC/Po5oFcoEYr6nPC4ptySz5fTfRhv7/2NKlqJv8MEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754499933; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xJlOz+Jg5Eh+vkwIFvbU82F8MEu7BNgLBhpUCzS/X/E=; b=HWr5UzLTqFg/XUaHcmvZMgj+4LLIYhL2TJ2SMhqK5LPRzjYgvcTz4agvWGA0IMBmEXAPqLJAh70aQ+TtBuU+Rz/rg/RAxGjWbfbhCL/QJdfgfQIGIeg9CbHMlr4bY1aMEXra6HiUK7F+M9OsAsIxyns85rlMSnhGue55X5SRX9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754499933922189.96016170004907; Wed, 6 Aug 2025 10:05:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujhZQ-0002Yw-Vb; Wed, 06 Aug 2025 13:04:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujgPS-0007Hs-42 for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:37 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujgPP-00037Y-EN for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:33 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-769a21bd4d5so126606b3a.0 for ; Wed, 06 Aug 2025 08:50:30 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:4cca:cbdb:3f01:1165]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e8976a3asm163374575ad.87.2025.08.06.08.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 08:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754495430; x=1755100230; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xJlOz+Jg5Eh+vkwIFvbU82F8MEu7BNgLBhpUCzS/X/E=; b=cFUzqpfXdpl5o55S1RU4w5n2yA4UJpWThn2MsUjrNVI597baHaQyizIhfDDc2tzJjq uw8G0sSDk6Tzx32HSfMUvmr5bpnIexRB0TIcCwDiG8tJcVGVSAZa+IJxgPZw/PcZoXfR UbHztSZSXD7eOgD074bMH34f2A806RfDokWUnQu08Fx0fF/AnARiBpiOd4O0C3E/H61l gs+c4LlCkWqhHj6PsqlGGULK3DIG27oVAJaTWnbGgsw+KpJwMu3mifYxvDGIr2Ux37dV s2vIS9DZcYPyp7yQ+mnr2QHaAajzR6yOta9XXeNZ/hRg2aTBdnw6AuXr93r12F7tslTC Qv3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754495430; x=1755100230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xJlOz+Jg5Eh+vkwIFvbU82F8MEu7BNgLBhpUCzS/X/E=; b=S6UadTRud6dGr7epFf8+XkKuWryDW31JBOzyqZjKKvEZnnNcC4ri5dG3VnW6myQW7w kzbDm75iJDgrym13NrO4uZffU9GV1VZPWOo060M9yYwcjcBaJp/Gk5rBsEPjpzoecynQ L+jPHMFXGpd08BVUiSYJQzYt9i2qTB1K0DGDV/QZPJisstUWqUBgeCrN1h9Cu+vjR36T QR+eUEzSA07mdqrkVybAKyEBSBPfdTSYBm32YK4eLfBL4i+VDgh80zyB3c4/S2QMCy/0 oXEQYVot4gHZgcmS064C8rPpKZvc0yxKlLqUBZucyc8HiCxs1Y3Oc/3srBg6Eyx7pYQD fG2A== X-Gm-Message-State: AOJu0YyxeGt6q3DOjoe3nhvkPesvK6tW1Fz2MWSUgWBvPXjd8dJwCp4q qnJFhDD2oIYSLCrlef4izOYjl35a9hh84rjg/nEaKMD09acRbVxZmGdQHdVqQg== X-Gm-Gg: ASbGncsygZ5AvEpKLcRKTLyzdcd6ojznlCMbrh1eAC12QMnkXs07do7iYGvkORLaWBA iKAvHmOmhpYZpGjfWPv+bsPAulXMd5RmMrkKxn3mx67vdn3ufvhYKUBr22qCU8S9YS8isTkWsFx 8kKW8LNglhsdlwUCtitXFuvADnW9QOEFOAUu0RrjKgBhE2a6vuF2EbBci362I3YcuTdmkZOFe0i dQNCzBNAo/btJJMAWKT/mTgwYUt8eTHhrsON7QwM1mXD6SeysbMX4X6S2KRX8abhPIjYxdBZeJ6 3Mlj3RnO/GFRx5wgba16HQyHrsGbsSmVn1Xl+RVgfZn4BJgMmdqFey+W4WacaTf95OOzmhCHgwv 6GtDolIq2U6ZpKZa1J09jRcmuF/l15+nD X-Google-Smtp-Source: AGHT+IHlWUkoAJSlKgoqYOsN42Bumz9b1gBCwHLnV+2jn8B4zHHFrPYtMiYa4wO86b6IVDtCInpARA== X-Received: by 2002:a17:902:e54d:b0:242:a0b0:3c1b with SMTP id d9443c01a7336-242a0b03f31mr35484625ad.30.1754495429670; Wed, 06 Aug 2025 08:50:29 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Pierrick Bouvier , ktokunaga.mail@gmail.com Subject: [PATCH v2 1/4] meson: Add wasm64 support to the --cpu flag Date: Thu, 7 Aug 2025 00:49:48 +0900 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1754499936381124100 Content-Type: text/plain; charset="utf-8" wasm64 target enables 64bit pointers using Emscripten's -sMEMORY64=3D1 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#mem= ory64 Signed-off-by: Kohei Tokunaga Reviewed-by: Pierrick Bouvier --- configure | 6 +++++- meson.build | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 825057ebf1..7f3893a42f 100755 --- a/configure +++ b/configure @@ -365,7 +365,6 @@ elif check_define __APPLE__; then host_os=3Ddarwin elif check_define EMSCRIPTEN ; then host_os=3Demscripten - cpu=3Dwasm32 cross_compile=3D"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=3D"aarch64" elif check_define __loongarch64 ; then cpu=3D"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 architectu= res # that are going to use TCI anyway @@ -535,6 +536,9 @@ case "$cpu" in wasm32) CPU_CFLAGS=3D"-m32" ;; + wasm64) + CPU_CFLAGS=3D"-m64 -sMEMORY64=3D1" + ;; esac =20 if test -n "$host_arch" && { diff --git a/meson.build b/meson.build index e53cd5b413..291fe3f0d0 100644 --- a/meson.build +++ b/meson.build @@ -52,7 +52,7 @@ qapi_trace_events =3D [] bsd_oses =3D ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly',= 'darwin'] supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux', 'emscripten'] supported_cpus =3D ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', = 'x86_64', - 'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc64', 'wasm32'] + 'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc64', 'wasm32', = 'wasm64'] =20 cpu =3D host_machine.cpu_family() =20 @@ -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 =3D=3D 'wasm32' + elif host_arch =3D=3D 'wasm32' or host_arch =3D=3D 'wasm64' if not get_option('tcg_interpreter') error('WebAssembly host requires --enable-tcg-interpreter') endif --=20 2.43.0 From nobody Sun Dec 14 01:38:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1754499946; cv=none; d=zohomail.com; s=zohoarc; b=hHvceB3yzqtLYwU8ARWFMm9Vq/O8iSvp2u98b0nD3f9oBqzXM+SBWXqM03I2Lhy0BY27pazJu/6AHCFuxPbhWRrr9eBN0qhsbqwh4UZibl2vkQh3vPxwm7IYqGft07GKhHK/mzV4ZYJVPg1m3YfY6vZfjEGfk6q3/SgzR79MCxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754499946; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0jQ+A2B4/31X3g/xelQjAlNcCLkEAfdCCEhDs8zkIhU=; b=QUL8iCPPncLEgFmAhE5HW9GGJg/UzQCmuSu45zhE1WUdSwttNrGbCfAIORkyLzBuowc3Bs7e26TJ6TVIqg6hNbv1T4zTktymXmBDDYwq0zMIM2Net+7gLDnlCEDgjQZFG7AbCc6E10P2E9vhtV6oYBeJRdGFH0/2/Adgj/tnxrc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754499946175598.0679433548625; Wed, 6 Aug 2025 10:05:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujhZR-0002ZG-Rk; Wed, 06 Aug 2025 13:04:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujgPT-0007Is-UJ for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:39 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujgPS-00037t-9y for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:35 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-24022261323so11860255ad.1 for ; Wed, 06 Aug 2025 08:50:33 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:4cca:cbdb:3f01:1165]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e8976a3asm163374575ad.87.2025.08.06.08.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 08:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754495433; x=1755100233; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0jQ+A2B4/31X3g/xelQjAlNcCLkEAfdCCEhDs8zkIhU=; b=lI/PRlGJM5ORunZcYCuGSnT2VAapwUKs1rrN7tOEWTQopEOFaV1ZwbfpLiv3sg+Xm8 Tv3L9B0kjA0kCi8qENnNN87MBAFd/edaHfMrDoKF1dR4PBPsaaRA2dxRR7bP6Iu/wo66 2hMM+8G6/iS6gMF3uyG1ujSx5IqRUIcwmZb8rIaNvw6nGYXwofXX8ix8j+vtu4imeczD eHPos8nDVLkvrQDLJWmvWybbhH8SUOODunZ2ha4kHSbvH/BRlNGRRV6Owzq0NCkONHqQ +G2P0Q4+Uh6XE4+Wfzvogx1Qril/J849mM3nv5EPObMIIa6fg/Pou8AVmEU63+HfGkXh Pgnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754495433; x=1755100233; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0jQ+A2B4/31X3g/xelQjAlNcCLkEAfdCCEhDs8zkIhU=; b=NMfkuFH5vPs5mVAlf17I6j2CqbQ/9OpZrP1DN0rVtjbXtpkY+k9WLOlmbPtccUuwKq VxmjlE7sRcErid6QKhcgodVuEUOW8njfWHEWf+7fmYMdM/cvCoENAUK9lK76JVGd7+is 11WdsOfmkEVMmXBm8Zb0H8a6UGAnSWIVg5s53Cki6ZYD7bm/Q7F6tVJ03obeqi2OWSVB i8ugw5v5EnUPa8KHCLE0Vh/scK9pY8CovDy07BL7DIE3i9w7G4SpELFBxr3joMKy/vJs lvg36N4KJy/4cM9UeYgFrI15QBbTMX6A3nwWxsC+EdvXu/3lD/3Uf6b44/uoizmtN2yP s6pw== X-Gm-Message-State: AOJu0Yy1PsmAp6hIYJGF3j64AQHdnyc0uTXXwZvvHq1gjEQDVBgv++e0 Yj8QNqtEKBUHhXYzBe89b9HopefNnb8e/JviIIFoi1OOQ89lQaaypQBOlepssg== X-Gm-Gg: ASbGncux0tkwX+KNMGKProtyGkwsxCcOVF4RbORgrC0DSqQJFKu46h5dLhdEQDysZ9g 3g0CPjMQ34ofLVuRPhWEAeLx3aLkJbkaK6lYjvLi0tgVNmdejtk/jhlGNyidehhTrcggljOypeE D1Xbzcyg2iFSIADbVNeFCnll1gm0u1LAFOlpMJ3aujobxvZxg4De4Pl2kaVesX9wijyUVTHdLU8 xqjITw+VuwjFcpczR8uOHdIGoXm/9OCJOFeWrRuhWK6TIdjXbqUAjuSmhUVrppJkj2o5yZ0vCDT 52T7C1GziiYSlpJi0rRS+uAOnJoKKNPRA9QveMO3qVAlXiWlbvbfnl8OFaVka6WTQqZIxYrBpni ROWWOQtq85a/vWT2wnY4tFtXVFRROJiq3 X-Google-Smtp-Source: AGHT+IHdpja8+IelLL2/3wg0X3v9sNx1NDvFbS3W0Agk2ElfjDlbsptB7U3qxYfze07FWXXM1W/1tA== X-Received: by 2002:a17:902:f68f:b0:23f:75d1:3691 with SMTP id d9443c01a7336-242b06b35b9mr551645ad.15.1754495432777; Wed, 06 Aug 2025 08:50:32 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Pierrick Bouvier , ktokunaga.mail@gmail.com Subject: [PATCH v2 2/4] configure: Enable to propagate -sMEMORY64 flag to Emscripten Date: Thu, 7 Aug 2025 00:49:49 +0900 Message-ID: <112b6882f9bd370deffb8637116fc44e043c250f.1754494089.git.ktokunaga.mail@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1754499948406116600 Content-Type: text/plain; charset="utf-8" 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=3D2" flag[2]. Emscripten's "-sMEMORY64=3D2" 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#mem= ory64 Signed-off-by: Kohei Tokunaga Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- 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. diff --git a/configure b/configure index 7f3893a42f..0587577da9 100755 --- a/configure +++ b/configure @@ -182,6 +182,10 @@ EXTRA_CXXFLAGS=3D"" EXTRA_OBJCFLAGS=3D"" EXTRA_LDFLAGS=3D"" =20 +# The value is propagated to Emscripten's "-sMEMORY64" flag. +# https://emscripten.org/docs/tools_reference/settings_reference.html#memo= ry64 +wasm64_memory64=3D1 + # Default value for a variable defining feature "foo". # * foo=3D"no" feature will only be used if --enable-foo arg is given # * foo=3D"" feature will be searched for, and if found, will be used @@ -239,6 +243,8 @@ for opt do ;; --without-default-features) default_feature=3D"no" ;; + --wasm64-32bit-address-limit) wasm64_memory64=3D"2" + ;; esac done =20 @@ -537,7 +543,7 @@ case "$cpu" in CPU_CFLAGS=3D"-m32" ;; wasm64) - CPU_CFLAGS=3D"-m64 -sMEMORY64=3D1" + CPU_CFLAGS=3D"-m64 -sMEMORY64=3D$wasm64_memory64" ;; esac =20 @@ -795,6 +801,8 @@ for opt do ;; --disable-rust) rust=3Ddisabled ;; + --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=3DTYPE which container engine to use [$container_eng= ine] --gdb=3DGDB-path gdb to use for gdbstub tests [$gdb_bin] + --wasm64-32bit-address-limit Restrict wasm64 address space to 32-bit (de= fault + is to use the whole 64-bit range). EOF meson_options_help cat << EOF --=20 2.43.0 From nobody Sun Dec 14 01:38:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1754499919; cv=none; d=zohomail.com; s=zohoarc; b=jdVgApkliZog4qOJwbimDkyhK1dVuFzpxp0hPqcanFH9PUzHyXyc6llpKzPbOBxST6dyCAK/r8/PzJwuO6owvYqvMiVAUPxTliclorMSPX6tCRYz0My11OlBH0TTG6TPoVunXdcpOzzyozzzYEfp+bulDa5fZ6kFfQmuCoRDXCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754499919; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+x9rJebi4ww0j3yzQwPP8A8E8ND6zxr0JuowMgv1Zjc=; b=cvR7JFurKwhH0VYlFMs55pV+CeUrEmowirxJRqQRUMvKEr2pIT02V7UzFXoy6jEJvKPnx4fH1EqUFBB84rZMOKVxbCnwtMoN7GKA/mU0l0nSHXOu+gXJQuvOBcb03PMLNJiuac8RfD27I4tm9cenYMMeMN+OCm/eKJUqgaKWCEw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754499919565718.1747081478607; Wed, 6 Aug 2025 10:05:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujhZK-0002T7-O0; Wed, 06 Aug 2025 13:04:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujgPX-0007Ji-Ev for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:42 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujgPV-00038E-J9 for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:39 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-76bd9d723bfso100741b3a.1 for ; Wed, 06 Aug 2025 08:50:37 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:4cca:cbdb:3f01:1165]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e8976a3asm163374575ad.87.2025.08.06.08.50.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 08:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754495436; x=1755100236; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+x9rJebi4ww0j3yzQwPP8A8E8ND6zxr0JuowMgv1Zjc=; b=VX7AE0NV+U/it1jolnK3Pvi43lrmFhk7PKRA+QkhuoeT8Hme+BNbvHs1kfmgqDSjQe kkKdn5Lsi5hPHGhrRwhKlp9LMFJJRrlzsAfJC+dFiQYA24RK1rfb4F0ljDwlrrVCmhzW Z/dyIN4BYoaOUXZPVFCZdLlrXW5xAHMrYEOTA6YzXEFhKFULBIYB9sM8nCc5RswPNbdI /mcv/5S9BHB2Yc4ZRdxj+sgMY7zpMXMXLpsruWx2G9NWKNh/Krml5wctArbLGqbxn0gb DBkuu8sLw4TLAQ/lny65yyLq8gQdk9vyuumYCVDZmBBzBcmv2ltrITtEIBUGU7Ov5Xj7 VJpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754495436; x=1755100236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+x9rJebi4ww0j3yzQwPP8A8E8ND6zxr0JuowMgv1Zjc=; b=ne9ymEzfFoDybmwiOp+anK4f6iOxdZrW/0UjU+1cJPnWUGZaHbRjkBMUhlgROTTHoV y/db7Oo4iW3LIJ2ER2vWQgSyTaGnj+cPqc9RxsUHeyQpD1VNGJ7lz0aDnPdVq0J6HCjz hhKJ72d407s4Pzr9ZPGY9Q1MQbWv9IP59MhWSK/CAji1vcEPxuKAmp9Qqa7avxYoO50c Dtn4/P3GK1y6eyJdgCr739uM57miUhtsMjAnDfdUhmrLJhcpr2rpVDRsbkyOwMdjHn7B jTwcp7YsqQd/vrFGxaJBCC55j6xLNTfwc62FHOs45RnCSw02Id4t5geXSAM2TItYYWve v91g== X-Gm-Message-State: AOJu0YwGCA0vDECbHt12+1j7QW2NkRsVMI30rxQ5sBSiDsTTtoTllXAo gBxbl/6izP7MyXu0QOMtL+Jgg0C3N0TOqTJCayRnQ9zms79t+NjoA7QKmOjV9Q== X-Gm-Gg: ASbGncvtLaZgKOJZ5LsTs+qBXefuLjZyFNnzp9ni2nktZwehHmWyvHlslMmnqasacOA akcPB176j/zl++1GVVi96ZtKN/unpGObuHsVyQHT5K96P2KPn1VcyKiQEk73MQtLDjusooXZ3rR Y3k+8mrw/mplsF+Kxh6BlnzmECnLa3sbFwxG6TWXUkqit1rOgMCmUOkvwyk/CexBgc0tC/R9BfJ ItwbrAAo3k5sLLymR6DHwHIY3skXV8bF8HRVQxxrza0jbWWtt176WLAQO6lp/PgmxK1OBV+Sf94 ScwmYOT/9K1RMd53iB6QWkJNMbmT3IVJa7TPMa2K3ZT0k2mcxck/yFE+/WJa5LWRZZgpr967YOG 6PzC9DRGpYC+GSLD2PYlxhA== X-Google-Smtp-Source: AGHT+IG6xzIN3ultW80XyTJTvNIb7qd2LMqbOS5wuQRpE3mTzy5C5zlTUOeAX42jEvWorZ1dzOFR7w== X-Received: by 2002:a17:902:f60c:b0:240:2145:e51d with SMTP id d9443c01a7336-2429f625afemr55702845ad.31.1754495436010; Wed, 06 Aug 2025 08:50:36 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Pierrick Bouvier , ktokunaga.mail@gmail.com Subject: [PATCH v2 3/4] dockerfiles: Add support for wasm64 to the wasm Dockerfile Date: Thu, 7 Aug 2025 00:49:50 +0900 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1754499920192116600 Content-Type: text/plain; charset="utf-8" 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) Signed-off-by: Kohei Tokunaga Reviewed-by: Pierrick Bouvier --- MAINTAINERS | 2 +- ...2-cross.docker =3D> emsdk-wasm-cross.docker} | 29 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) rename tests/docker/dockerfiles/{emsdk-wasm32-cross.docker =3D> emsdk-wasm= -cross.docker} (85%) diff --git a/MAINTAINERS b/MAINTAINERS index a07086ed76..433a44118d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 =20 Alpha Machines -------------- diff --git a/tests/docker/dockerfiles/emsdk-wasm32-cross.docker b/tests/doc= ker/dockerfiles/emsdk-wasm-cross.docker 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 --- a/tests/docker/dockerfiles/emsdk-wasm32-cross.docker +++ b/tests/docker/dockerfiles/emsdk-wasm-cross.docker @@ -1,14 +1,17 @@ # syntax =3D docker/dockerfile:1.5 =20 -ARG EMSDK_VERSION_QEMU=3D3.1.50 +ARG EMSDK_VERSION_QEMU=3D4.0.10 ARG ZLIB_VERSION=3D1.3.1 ARG GLIB_MINOR_VERSION=3D2.84 ARG GLIB_VERSION=3D${GLIB_MINOR_VERSION}.0 ARG PIXMAN_VERSION=3D0.44.2 -ARG FFI_VERSION=3Dv3.4.7 +ARG FFI_VERSION=3Dv3.5.2 ARG MESON_VERSION=3D1.5.0 +ARG TARGET_CPU=3Dwasm32 +ARG WASM64_MEMORY64=3D0 =20 -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=3D/builddeps/target ENV CPATH=3D"$TARGET/include" @@ -33,8 +36,8 @@ RUN < /cross.meson [host_machine] system =3D 'emscripten' -cpu_family =3D 'wasm32' -cpu =3D 'wasm32' +cpu_family =3D '${TARGET_CPU}' +cpu =3D '${TARGET_CPU}' endian =3D 'little' =20 [binaries] @@ -46,6 +49,16 @@ pkgconfig =3D ['pkg-config', '--static'] EOT EOF =20 +FROM build-base-common AS build-base-wasm32 + +FROM build-base-common AS build-base-wasm64 +ARG WASM64_MEMORY64 +ENV CFLAGS=3D"$CFLAGS -sMEMORY64=3D${WASM64_MEMORY64}" +ENV CXXFLAGS=3D"$CXXFLAGS -sMEMORY64=3D${WASM64_MEMORY64}" +ENV LDFLAGS=3D"$LDFLAGS -sMEMORY64=3D${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=3D$TARGET --static RUN emmake make install -j$(nproc) =20 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=3Dwasm32-unknown-linux \ +RUN emconfigure ./configure --host=3D${TARGET_CPU}-unknown-linux \ --prefix=3D$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=3D${WASM64_MEMORY64} RUN emmake make install SUBDIRS=3D'include' -j$(nproc) =20 FROM build-base AS pixman-dev --=20 2.43.0 From nobody Sun Dec 14 01:38:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1754499956; cv=none; d=zohomail.com; s=zohoarc; b=VaxQqQnXWkKW5oFIGrbpqehwE4LXFfvVtF9MH9mZ10RIDcfDkob3IRdGxeodnicWhRMjMAwgGXFprtH7RkR6KUW7CLkjX5VgHH6NO7s2guoIDYR0k+IaqHZcXp+OQLFz75e/uAHhu2AZzwrXT9vf5GhJRnC+Y+PEZDRncjK7zHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754499956; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nqfVs8LrCw6VFYQzRNYHUlfWzAl7tvJj6FpfwaoQEeA=; b=LaGh4DPZDDIaG3RieLSxHUPpY/CcXk9FrZ32U7H+s/wcdrUh+azewXRr8UV+KJdUql3R4rj5Cf7BWFYc6jujHLjSZEoVIs5p8fxgFT4aG5qBwYSwBIofJooy3kfoS7W+zRcKPzVxdd0Iejm/4gHcEX0/UjJ3rEKobGjFAtHdFsg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754499956128161.87260450211159; Wed, 6 Aug 2025 10:05:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujhZT-0002aT-G8; Wed, 06 Aug 2025 13:04:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujgPa-0007PG-De for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:43 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujgPY-00038U-Nc for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:50:42 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-76bde897110so99894b3a.3 for ; Wed, 06 Aug 2025 08:50:40 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:4cca:cbdb:3f01:1165]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e8976a3asm163374575ad.87.2025.08.06.08.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 08:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754495439; x=1755100239; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nqfVs8LrCw6VFYQzRNYHUlfWzAl7tvJj6FpfwaoQEeA=; b=HjI8IQZpFZ3WwdcdflLo/I4qRyX8MSjlYx29A3+EGp2Q+GjWfIMArHQXczT+mKPTEo /ZfuD7vRvaCNr7fznZP+ZSP3wlBzd0vWvkvWT5aNEGo4XhRoqD1d3Mcno54NhJWFuia6 YAHQWOcSrtDUDK9N2G6GvVfi8hDJzi+vlw3gq9Yqyhd01xFwi+li1SSqIr+/HifKeRIz /8hePLzI9veLf6cNHGsJYb2Lc1+zhJ+puojn7kbkFIHdxI4VTkfR4qm19UM0WQxLvXoH dvZRPvpAS+XO8cjUh3ZsqeXhLf0jRcONSsy6ppQsNfg4MnYWJ48lnEONtmU++Q367OcP IIxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754495439; x=1755100239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nqfVs8LrCw6VFYQzRNYHUlfWzAl7tvJj6FpfwaoQEeA=; b=lgQsDiWeLY6VSXrAoImrWxS72KBDxUeiTr9aeATXFn0j6h6qJkWoH2gTovOW1f0dnK Byw9lvs4Qc85zwXb74mUxR0NDDPUA2+zTrUk45A2lKk3QJNP8Yet3L2CIg8p3Xe9JbPJ 2j5/5Upswc29hNVaCbG8vPtt1WKMxGal/P5y0YUejyjVBvliet/qAxxBFvkNa0/L0FCb bfR+uo0zzv20zSt17BzYXEzkCx01rieoyzZOHZx8m3ThDcvovs/mG3bVZPUePfyyvmtW dWbeh/3zIefSxf9S1wjAP/4cvtNgh1AD6VSwaMPkNfrZm9ysmO9mrLwT2VRGXB9Z5kq+ 6Dpg== X-Gm-Message-State: AOJu0YyaRrlf/O/cuuLKKuKV1xonU6bxvPrqzrQ5xUNgDkQAGhC+F5+p xIr2tPz2S23zOsr9tLDHMgx1P1U9R4w0qvPAKKfVg+pnOOXbCQQXq0pJjdphpQ== X-Gm-Gg: ASbGncsm68HLyGntQJZcmBS1Qa3RaJkhu5KAQc7CEXg7d+wvwqQTr/UMjaLtMEqr7VR A+GL4QRAXbRSZ8Wn/Wn2CgSCiv3yPUysEEU3oRi80brzhE1979L/0sbAfisyeiGinDOTQazZeD8 eJFY881EgX1eE3e87KpdS7xmTFUBZFzSRXa8DNM4A0pfet/c1m9GbtqmsLRqSixWTIsPvq9pUtX jEI3seGeUVx7qg2orrgRUhTtB/CMUhuVP/1O+o/Zlj/AAktBRIybE1603FFvFFB6kMlQ/13huYV 8wUdIr5TuoKxdgkI6pdMgC9+iRI+HKKqaVIkSOcWi/L5FtTeeVY+ZJsxVM+++w7nMbfrtVzEcba 1umQAYPI2VXbQ/zLvCzgEqg== X-Google-Smtp-Source: AGHT+IGBtSenovuocauq8HTqJyl+RQD6Ky1dHozafLxbi+glLX8VB9Py22N0XezBHfbxzJDta5tZuw== X-Received: by 2002:a17:902:e944:b0:23f:d47a:c9d3 with SMTP id d9443c01a7336-242a0b00209mr36028365ad.15.1754495439281; Wed, 06 Aug 2025 08:50:39 -0700 (PDT) From: Kohei Tokunaga To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Pierrick Bouvier , ktokunaga.mail@gmail.com Subject: [PATCH v2 4/4] .gitlab-ci.d: Add build tests for wasm64 Date: Thu, 7 Aug 2025 00:49:51 +0900 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1754499958510116600 Content-Type: text/plain; charset="utf-8" The wasm builds are tested for 3 targets: wasm32, wasm64(-sMEMORY64=3D1) and wasm64(-sMEMORY64=3D2). The CI builds the containers using the same Dockerf= ile (emsdk-wasm-cross.docker) with different build args. Signed-off-by: Kohei Tokunaga --- .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. diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d888a60063..0dded04188 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -787,11 +787,29 @@ coverity: # Always manual on forks even if $QEMU_CI =3D=3D "2" - when: manual =20 -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-i= nterpreter + CONFIGURE_ARGS: --static --cpu=3Dwasm32 --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=3Dwasm64 --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=3Dwasm64 --wasm64-32bit-address-limit -= -disable-tools --enable-debug --enable-tcg-interpreter diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 8d3be53b75..1bacaff818 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -92,7 +92,23 @@ win64-fedora-cross-container: variables: NAME: fedora-win64-cross =20 -wasm-emsdk-cross-container: +wasm32-emsdk-cross-container: extends: .container_job_template variables: NAME: emsdk-wasm32-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm32 + DOCKERFILE: emsdk-wasm-cross + +wasm64-emsdk-cross-container: + extends: .container_job_template + variables: + NAME: emsdk-wasm64-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm64 --build-arg WASM64_MEMORY6= 4=3D1 + DOCKERFILE: emsdk-wasm-cross + +wasm64l-emsdk-cross-container: + extends: .container_job_template + variables: + NAME: emsdk-wasm64l-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm64 --build-arg WASM64_MEMORY6= 4=3D2 + DOCKERFILE: emsdk-wasm-cross diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml index 4eec72f383..01ca840413 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -10,12 +10,14 @@ - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:lates= t" - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" - until docker info; do sleep 1; done + - export DOCKERFILE_NAME=3D${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=3D1 - -f "tests/docker/dockerfiles/$NAME.docker" "." + $BUILD_ARGS + -f "tests/docker/dockerfiles/$DOCKERFILE_NAME.docker" "." - docker push "$TAG" after_script: - docker logout --=20 2.43.0