From nobody Sun Dec 14 01:38:58 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=1754315959; cv=none; d=zohomail.com; s=zohoarc; b=N/TBDpnbmjoOHW2tKGEEW1sIwfzdgzH2DIvq+V1XAhG3p+J7TaRTtS0SNQ26nWJkc5Bi3irhwgHllIqWaGdhy/WRh/Vm97KWhLWNV8dTwZamtCPAiPN/BIg0Nr4WnerO1FA2RY2F/BhZUa+0Xvv6DyFyuDTUiCVpoIreKYXI7Oo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754315959; 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=VZ95h7fnUozk5YehSRRgXLq/R5cFsoMSexleWIPzr1E=; b=WrbYiSswTifJw2n1pCuMZt+FLg0XZ9PM/ouT1wo+C7gEY2Z8TGCyIerByx94OYEiWGJqKTtua/Yo4yOeGZOR8jg62cLW+3MC+Tl/ZK4dABiwgMdkZ6tP3LKXM2fTTUEQMKUg/Bvb5NpiX3rmUF6PFDV0F6SobhshEmmuJcUOnGM= 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 1754315959028736.5720991561345; Mon, 4 Aug 2025 06:59:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uivhm-0006qU-AW; Mon, 04 Aug 2025 09:58:22 -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 1uiulF-0004M7-BE for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:58:04 -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 1uiulD-0000SN-3u for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:57:52 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-76be6f0557aso3081785b3a.1 for ; Mon, 04 Aug 2025 05:57:49 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:d117:15e5:e721:f1cd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bcce8f800sm10488308b3a.42.2025.08.04.05.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 05:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754312268; x=1754917068; 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=VZ95h7fnUozk5YehSRRgXLq/R5cFsoMSexleWIPzr1E=; b=ZDYhNuqW+wAlcHHMC3E4CmqogPp14rcTk5dJCqSI7tcki+sACRQ6n4jjhvdE4Hk7xv LR/CuR7pDvY3ty1wgK8r+XK9rzjII+vYE8ZZXiOEk5eD/Ju+oFo8i9Tmc9atY5x2eayr hy5Am33F3PiVIFWuZq6Q1FykNTcznhmmwA+8Soe7qQmMZ/dtsFnFb4bkiZgQB0WzTrVb reflPfV4eOkUO75xfmGM5ogO4VcTk5yJI/2bL7EcqDeQnt7e23ecxlD65a1HYM/FScjB 5AiaH+ZvSh7edISl0PFmemVX7zj6WU8Y2Yh0tdnAMi6upITv0fyjEYwMdOvvwHv1leB2 N/Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754312268; x=1754917068; 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=VZ95h7fnUozk5YehSRRgXLq/R5cFsoMSexleWIPzr1E=; b=JvJRIMHY3yG/DmoOF0AV9pmWd4uijQHyEcLec0z1s5Y4qR1e8E6aq9N/RYuRSL1NL3 pxBKe4dTH5U90zCHJo/5v095f9FrFr1F+3oSGTxyG3thfJHjked7KRpMNt8G9x0ckIVK ghJ6cP7nhPDozaatI3ujf/RRMOXbheKG1LFmsKpFaF+jhPr6T6GJaWUCdwJ8VzJNgQaD qFLpVHq8M4Hcr7cfn5d/bA+lFrtyGn3jCMrb164kGPHjldRxV4KlbQDzpnsoCqy5XCDr MQeYRkOB1pHeGbza/STdE3rR1yNoG6uu7KnmY5TFCGuUSSGr3URw3ZZjQHzS19kSyYqu MT0A== X-Gm-Message-State: AOJu0YzuJVg3GP/jAZ7Xza0A+xLDk0Ki3RIzxZSQFXibme9UiXNrdyeS nUTpULya/3bNhgM/cJaa46tCGrIxua3W3HGe3jUuw3llwivGG8LKSPn28q7oUQ== X-Gm-Gg: ASbGncu/RGaCHsA8A6viH0QGKOftP05lH8x1othcG+jFgiv29/Wl7w08vQ4K0tOIyHu /1DxQKkBqdqtq3B8r/fuSD3JSUPufbfuPF0xOd36ZAMGao/XRMP0l2uNxn+YCPkZkum6779P481 V2eVvUxNKWMYpznlf0WQ7rEqerA28HrpQLnhdQXbSyv90pb3ykiKQXqu6aywp5sCDx8aOaDl/aW /d2Zkh2aNWtHg1ahZ4FUK8tLMWCD88mOJqwW5nR2oG9PcpROjJ8mpGWm8t5udGWwOLV/AifQoRx qxh9tibBSq3ZjQrE3+NQlg9I0p+lvpigaubqBVVPOyq3tqskHGrBEWOoQtIKXKJfSx/Akb3KHBR JIOOYaB7DnzeLnLraWhIS/g== X-Google-Smtp-Source: AGHT+IHqwalA5mv0sCr7uJw+dRTdaPYl92FZAvh8o2WM2wcsVV7XqEj04qKpFnzQ6Xm6HEVr3Mkwcw== X-Received: by 2002:a05:6a21:33a2:b0:21a:b78b:e916 with SMTP id adf61e73a8af0-23df9808914mr14177331637.27.1754312268503; Mon, 04 Aug 2025 05:57:48 -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 1/4] meson: Add wasm64 support to the --cpu flag Date: Mon, 4 Aug 2025 21:57:14 +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: 1754315959827116600 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:58 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=1754315920; cv=none; d=zohomail.com; s=zohoarc; b=lNETAfGrZ34UnmZCaLt5Pl0vwy31AlqvsghzeDTdI4fGHY4Kewd36AN1VWgf9S1QC5zNLGls5BlI0rtjUBKC8AP0Y53BtVpCeWuYBYiz2LNIfh8I1cS6j+izzNqAU8zSg7YH0DXxk88NY8URRMpRko9qoxMXHsCaNl6CPLXWOpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754315920; 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=YUuth8HbNH8Ia7rPyHh7evcGT1DKrq1MlXctr0Y3ZAs=; b=SaX6BhduOfKHyYmJaaUUgu+NE3xy9Svh5P+12o6+aIKaqtPrVOhFfGltUzqg8pJpLT46hpVRXmebzuYGjTNxtxsmzDBPd9dQAWJ8tfIjBWVdEDvjnozvx6yivQl6EGONslEmu8n6wKXfafxBB4IJtaVh0sd8/7WQv2ecPbWXeas= 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 1754315919994402.4296348094674; Mon, 4 Aug 2025 06:58:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uivhi-0006ZQ-Nf; Mon, 04 Aug 2025 09:58:19 -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 1uiulH-0004MY-3v for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:58:04 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiulF-0000T2-Be for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:57:54 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-747e41d5469so3392444b3a.3 for ; Mon, 04 Aug 2025 05:57:52 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:d117:15e5:e721:f1cd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bcce8f800sm10488308b3a.42.2025.08.04.05.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 05:57:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754312272; x=1754917072; 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=YUuth8HbNH8Ia7rPyHh7evcGT1DKrq1MlXctr0Y3ZAs=; b=mzJbyslYKUkEx58avSq1dtwcyj6/hOU/cRvuYjGxKQZfaCrqzV1HDljR3zcFZrPxeW cVvu25+vJNYwq5Be7gRn30woYFanQmV92JdAc6M6hRp969EE2XV+c1uUr1VqZ46CYGcY SfeXhsyGhWLQyR6llGWrOxERJC+/tyZnYUevANnhTOEsHKEiMxQryy7CAXLj2mP85Urz x4g3E/lCR+cBq4dti2bqKzN+Gma4NauuGEgPcvhGXUTTBO8lRenfhCI/jVyPVNDJrtH4 tAnJbYMD55VciGg3p2JX2VUkix7bj15iLrKx4p9xy7ywoEU3XBJ81p6PIuL6TYnjU1xj MfXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754312272; x=1754917072; 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=YUuth8HbNH8Ia7rPyHh7evcGT1DKrq1MlXctr0Y3ZAs=; b=BS7YV1ZNEbWtmVGVN/pr7mftWEG5YVoMGpJNgded5aN0q84e5aQHkwzqJFL8kXNjiA hqGmzkAsMWaKJ2yFODuhv4aRpuFiKSkzRR+1SOZssgSIp1D8P9PaKWxb1WmVwtMDz2Kq BfSSuplrdY7kczi2jq5EOuQPop3poMEzMFKvOE/FwD0jtLaREgXwA3/g0NmVrJbKUTfk 70uPE9SzyvN5cVrX8qb996gvEkWqkkGoY+LkRZC+KPnAR0+ZFxHl0iy7ubiPbPEB8II/ pEZ7VDqPlJV60qh/gwxpWAA180NShpw4Z5Oeom1xYtWP3kWjgnv0An5Ns+BN2L4IR9ym ngKg== X-Gm-Message-State: AOJu0YznPguuGhDzRsKQ7Od3WjP3DKhladssSjb8+Qe0tSQLwKovwT6y LoK/KmIwm9daXUoyHO+Hm7WPTdlWl4wjh02UINVfi/l3UBHY6fcD2vSyZz7ZTA== X-Gm-Gg: ASbGncupGCGzfXOXoBoJ9D8FXA5f2PEwIBkSznpSchUGzr3YrimeqV3oqkO6dQILJRL H51SSy8w+t2qVh5qB5xZI70SRERV46kgbqIgEbKKjHoJr6Aq+qn9+UGLnbiwadXBD+stY3OQTC1 eNSfQVvaWZSgOt/Rd4m9cgjaLm2IaCCGnZO7MDfTGQ1CuwTOtvHguiUAVL1R//PNrkaEVFOPc+O dWKzpvZFZk6mOENuUqVvfTPzH+/tbrPDUxG66KPFyrADekGUzbchecI5We5mlyHXAFMPf69IDn2 l8emEXKcQVXC6XHxaj0zR7E7Y6YFMckWh+/W+gRossCSBXHsPRJxUiyiopCfpUijWXER+2QX6CY lT4A90mUtOiVccBjIqYr4zw== X-Google-Smtp-Source: AGHT+IFGWFxcWqTy9uYd49JJ/Z0krs9Q/OT2j7KygQvVsFwjPb/8Rp/5tZRIcoDCG+9qfYVdwCl1xA== X-Received: by 2002:a05:6a00:2295:b0:76b:caa5:9a32 with SMTP id d2e1a72fcca58-76bec489607mr11071554b3a.11.1754312271852; Mon, 04 Aug 2025 05:57:51 -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 2/4] configure: Enable to propagate -sMEMORY64 flag to Emscripten Date: Mon, 4 Aug 2025 21:57:15 +0900 Message-ID: <9e9d4d6e10a2eaaca2d741184ba292d699ddff7b.1754310749.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::429; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x429.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: 1754315922303124100 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. This commit adds "--wasm64-memory64" flag to the configure script. This takes the value to propagate to Emscripten's -sMEMORY64. 1(default) targets wasm64 engines and 2 targets wasm32 engines with still enabling 64bit pointers. [1] https://webassembly.org/features/ [2] https://emscripten.org/docs/tools_reference/settings_reference.html#mem= ory64 Signed-off-by: Kohei Tokunaga Reviewed-by: Pierrick Bouvier --- configure | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 7f3893a42f..8573f84e26 100755 --- a/configure +++ b/configure @@ -182,6 +182,8 @@ EXTRA_CXXFLAGS=3D"" EXTRA_OBJCFLAGS=3D"" EXTRA_LDFLAGS=3D"" =20 +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 +241,8 @@ for opt do ;; --without-default-features) default_feature=3D"no" ;; + --wasm64-memory64=3D*) wasm64_memory64=3D"$optarg" + ;; esac done =20 @@ -537,7 +541,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 +799,8 @@ for opt do ;; --disable-rust) rust=3Ddisabled ;; + --wasm64-memory64=3D*) + ;; # everything else has the same name in configure and meson --*) meson_option_parse "$opt" "$optarg" ;; @@ -920,6 +926,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-memory64 Used only for wasm64 build. Set -sMEMORY64 of + Emscripten to 1(default) or 2 (choices: 1/2) EOF meson_options_help cat << EOF --=20 2.43.0 From nobody Sun Dec 14 01:38:58 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=1754315956; cv=none; d=zohomail.com; s=zohoarc; b=PNFqCaTYO2MWRlgyv960OezvFXESGbrNUjbtmjvdAKqAzT/MCybWI1Nw7VwUCIUT/NiE+rAO6YlJyEK+w9ujGCVTAdLOKo2xtVbXmhZislRumWRr/1VyWrz9lKQNdZvdzksTG5qL2WqpAAhj/q908C+7bKtC8t2/WmOzW3GozLQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754315956; 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=fk8p4F1HoflijBj7kvVH0absrkNmFbA/1BPCwWNDAoQ=; b=b3vuxxB0CLxTegqQ9mOxa2qragq0zibx/xWmX8Z6mivAx8cp+D9hccV4j/jKV0f3IkCDQTBFXocV7pWSlzKgnB/DA+SfgJgdmNtoZ+pIlqGLgXlpl+RioeKhMces+MphKMezgjAik/+/ufigWofrQX49dM5HjULtIVkdqebmsYc= 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 1754315956420300.9867523689269; Mon, 4 Aug 2025 06:59:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uivhk-0006gw-Jn; Mon, 04 Aug 2025 09:58:20 -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 1uiulK-0004Nr-JD for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:58:04 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiulI-0000Tp-P1 for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:57:58 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-76bd9d723bfso2525287b3a.1 for ; Mon, 04 Aug 2025 05:57:56 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:d117:15e5:e721:f1cd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bcce8f800sm10488308b3a.42.2025.08.04.05.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 05:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754312275; x=1754917075; 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=fk8p4F1HoflijBj7kvVH0absrkNmFbA/1BPCwWNDAoQ=; b=JqzwdFd0Ef+5O8dp1x70P+RXjfY1TCO6hbkV7uj/ELAjUyNyPP6FTiXqflvBpcrJS4 GdfeUN551u5cR1/lNju2pjkaUqe1pXGzdWLVb+fOwCfrGKaOL1EzY0JYGTh5L8AB9pc3 FPCHDQCJMdlR/uA3EcAD+x949Q/ZdHMan6MVsj3yOSOhmw+s9OUVPSUDF4YcBTC6HC9d qjVsASU6vN0ptEjOfvjC75lOumjHu41S+Mo8eTRgCSgkytRjvo6QgTtH9ojmxpIIUU8g pVOO1+R+2sJtZTHojrVVzUHtznjBoLRxjmSZvlHFWOCtTjc5YbOEK/xU6APMy8Jd4w2L SBqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754312275; x=1754917075; 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=fk8p4F1HoflijBj7kvVH0absrkNmFbA/1BPCwWNDAoQ=; b=fIGEFRmsTqfFTAhndOHTqTqqkOHDXZotx/yzdjNNXcz5/XFfak1ky+Z5gMr6h9zFa1 QKFqko7JbQ8atvdbbS22ppVHgy7SDACNpN008xAQhJGsEx8q/+RgitXvG8r7+JExJgc2 5IrRIOQpK9aSJPoniZc+hiqwRqB1jYPYEGRY8WnyW6wjZELzcKuGky6Y63RCKpcPxOdZ WK4sc0/wd8bBCPw6hZVSlc835gHRKkFHrF9oWljNF3wHulPDHjliHpqBsdsS5ri1PGhK T3t9AV+ymevQP/bI9w6cjtJXHeDNJH/gUADprKf85k0jJi5hz19pwDtJlEZvRubtVpdH jh7A== X-Gm-Message-State: AOJu0YxAYPxk3cezFDmkSvqawwo7XHavdxHckkK5qrpn3xwxQDPETvmr QCvrtdgE3swB93WEO9JRLjpx3srxmhq4tS/1iW3iWb+qIELXv1jjB6c+V5f4Vw== X-Gm-Gg: ASbGnctAvXaGdNHBJqFUXtbHtksgOgBI5fuO0OY1g1PTqD2s4Vr1kHTy0zcFoYgAVVC 6z3/GkRgS8Rq1gi8UBQYdM3uGMi9J94XSD9/M+DtGDn8j/5IggiqlakCcnmeoB5CII69NhujSYf K9w9AKpjYXeEkciTLg6elPr4w/wNTPXivFCX1cGGf+l3n1odWr1osK1DffOeOCBrwBuXZBxdTxH CG7FUo6iqFYu4rYZ7ukqTtHS8wjoUn+FuU6nl8bYYUsYK8eJXBTH+s09nP4rNPtBS8SqDOGJSoa 9XfxQH8+vq8lf+tq2lzDbYOSjmUFIQ7W9nDB6gSRX0Fe+tX9Nz2NdEaPYjBvUBvpoOLM/BS/JT5 C/ZvxjvI9oKct5NQa2HT/0g== X-Google-Smtp-Source: AGHT+IErPgoXDN7QRYaZRbdGRg9nvqFHGEycTjJH4moLsXq99uFZ8Vur6xDBtJH0NyqrgTRE/gm8fw== X-Received: by 2002:a05:6a00:80e:b0:76b:f8f5:2806 with SMTP id d2e1a72fcca58-76bf8f53e1dmr7318028b3a.22.1754312275360; Mon, 04 Aug 2025 05:57:55 -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 3/4] dockerfiles: Add support for wasm64 to the wasm Dockerfile Date: Mon, 4 Aug 2025 21:57:16 +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::436; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x436.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: 1754315958676124100 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 28cea34271..47b35bae47 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:58 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=1754316597; cv=none; d=zohomail.com; s=zohoarc; b=l8ZtfsbhiIMZIGbd7RiJuJ15PpU6q1kU0sPbZhlSh4U1CxzK/XphP8C/GogUf5oJlOFQAH9IVc7nAOwFhpjlBrrObQF436Z7XCvPhauYWobPhzQvhxajGjJA+bO51VgfgP9R4fv3OGGRsKqL+yLNhHCgTQ5DBToXaftKyvCQX10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754316597; 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=V/vS2KBui16zTZGJMb9su+mH6/2ju/NTf8jiWbG0wUQ=; b=iDzlYUrwlYUBB9H/blirvBZdNEUWWXBtE9LxHtufR2AV+EiKfKu4RfAV6C3i4tbGa8CyTp/3pywVTi0AeynvVMLVCDqKA8+3ko4vwDvp/YdNs5LKW+N4DZw+VLyqr9fgq9jDCCvsQd6z/PgpgTNp5otJXyhvfq4I7C6b8/fnjW8= 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 1754316597442122.70067972055756; Mon, 4 Aug 2025 07:09:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uivsm-0005QG-OC; Mon, 04 Aug 2025 10:09:47 -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 1uiulO-0004PD-Rf for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:58:04 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uiulN-0000UO-3Q for qemu-devel@nongnu.org; Mon, 04 Aug 2025 08:58:02 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-7426c44e014so3864824b3a.3 for ; Mon, 04 Aug 2025 05:57:59 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:d117:15e5:e721:f1cd]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bcce8f800sm10488308b3a.42.2025.08.04.05.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 05:57:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754312279; x=1754917079; 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=V/vS2KBui16zTZGJMb9su+mH6/2ju/NTf8jiWbG0wUQ=; b=fp6+nQA1NrprjRPdGwRTdJS3mrA1tVlJpIom9qzVZLkrHESgDTGxZQeKAzsrQ0z6up 65vNq9d3QTvDL4wFhLSpiUoWEqiN5kyvVwVrJ+JNj04z0CIaH2WYZiDEUm9DyvRpsnAx Ukf244JOUmsLbP3z2mvQupvpVmLpCEPnf3XKx2sdxsfyJmwGbAaVUPgqbNyN0CYBOcvZ 9jFk+vzH8qG3JqSJuD8Q9tkPgLgH8/WJc3jMY+ZEnRq4OtyaZ2DbwD7W7/PZKz6PcTaT zgspANgmX9Z91TkWlG3TM+CKez7gdW4tn+Yz5sYmEx1ISF+rQIpUYBVQlcaDL0E8lDcl qUgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754312279; x=1754917079; 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=V/vS2KBui16zTZGJMb9su+mH6/2ju/NTf8jiWbG0wUQ=; b=J9PElIa3zEdiNIRDXfwN1mlAUFAQt0e7qPO39f7L+Osa9dH0IUt28TN6KluEMKo/xw 68De6vgijl27CfGCknNLxn9XGGCLuHJJHcfIYMfkWP5lQ4X0nNn/MEN8gPGp/3gzGBMq GFMmFVWPiPNGW1E6uyscAA33WNzp/omb5D3dcAtn5Pkla2zB5sL5C6/RhKE3Owx6ZetL 2ogs13YrqWzJWtF96tZp/SKnW9zT+v4YOn2vMxeVHxJoZPxfY3wKlx7dOnJBb+/fDYbF P5+58tUc/d7BM+qxpgeh7GZNBY57T5ZlH23aXtdA4gp3DyLbolp6iDrUgg56Ys6HZBJU YFtA== X-Gm-Message-State: AOJu0YxZkHts1not0gp5LYNTSeZfCqd1tI1Cj07U/O9cy1TEiGvzigMr 6TmtMZPthHVi2B5XZbB9RmoYo2kPMjttWKUa0EhFR2CTUlklBlwe58CHwNjwMw== X-Gm-Gg: ASbGnct4atwp9GLg9kaaGh7goAZGOvuzMV9uws2an/TP/+n+4vuOQnRVdRN3kHMliUV fhFMcAkF3kRDNkkYLgxS6o/svreN/Z0fCDyJ3nGf0xtLWVWeVo3xD5WXOaCdsO3i5UO+oM+O5U2 jQV4X8gXi9HhVQ2qSjKJkJHzTU1NQXeLROn9JGV1qnYQDfMhVVn6jZ67w5J/ojrdN1SI6GnFO0k jLMpsOZr2EwRpC6ZsfIbtev+qMdCBssnQl6VDdrlYSrXfGNJhyleFcyPPE0ClzHgmcSrVXU3bX7 hkKhEqMjafH67bUqJ6uJ3YwRaRuqh6upqkq/iXGPJj41BhPQA9CdFN+FT//r0cQjTxdW2mbi8bK ytxSlKuSc0OiTXq2bg00mSQ== X-Google-Smtp-Source: AGHT+IFKHK7Sl5Z//6Qxf4XsoIpRfLqO6XcYwfs7ocy2SM/SYJ9jFuu8bxvO4eMHdilzduwifPWpnQ== X-Received: by 2002:a05:6a20:2453:b0:232:cc63:45d8 with SMTP id adf61e73a8af0-23df8fef591mr15166968637.20.1754312278668; Mon, 04 Aug 2025 05:57:58 -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 4/4] .gitlab-ci.d: Add build tests for wasm64 Date: Mon, 4 Aug 2025 21:57:17 +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::42d; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x42d.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: 1754316601139124100 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(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d888a60063..f45efbaae3 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 --wasm64-memory64=3D1 --disabl= e-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-memory64=3D2 --disabl= e-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