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=1754535861; cv=none; d=zohomail.com; s=zohoarc; b=OzA3O1hFFbau7L5hDfjm2WZ3kNLXW00XwHqKejdwI+RLWdl9skWT2+c/4tBtiVOk3sEfL2COpeZGc/ZXMCTt6D5bGqCdvCLiYYFT0q5yMf0ciCD8KHhb5lqS+RUovEz69qAf/ZncQFVqSK3B1pYOoYOWNbAHE43zVj0AOl2wECA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754535861; 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=QI0oMWWHqgi/mHNW/DSosiITK0NumoD+1lzqAS04UvumWXs08taq7Cl1wTHYLBsrmgO0sqemyJAkeiSgSjE71FPKViZJn+8Gf2nnhGIOTTa3Cwx4h2CR9OdlKgcD++XLoEwcYVs3a9ckMJ8BgNpeIZEiB3Lwcm5er2/2akLIeRY= 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 1754535861686224.28782862970354; Wed, 6 Aug 2025 20:04:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujquP-0007rC-GX; Wed, 06 Aug 2025 23:03:14 -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 1ujqu6-0007jl-5U for qemu-devel@nongnu.org; Wed, 06 Aug 2025 23:02:55 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujqu1-00026B-PN for qemu-devel@nongnu.org; Wed, 06 Aug 2025 23:02:52 -0400 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-b4272ea5dbbso426851a12.1 for ; Wed, 06 Aug 2025 20:02:43 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:81e2:9f1d:777a:7b46]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1ef6ac6sm173154585ad.1.2025.08.06.20.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 20:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754535762; x=1755140562; 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=mS95ZPDYt8cyhN5CFqd1sR4UhnGYOs6rWXaK6UltMRsZSI+IePzuFu5YLQKk3k4alb hpPlw/c0w+lBM8Ch1fWKFuvmWXTovnu1lqZamB0gLAJjD1CyyBCShR3hBDTd1dHIedRt AMpOi1EPtRCMJR0NVTsS27DlQTb6H7W5PsUdkfXpQjsZxmuH7Vo0NNaU9FtWYOn/Tvzl 6sOEhBfgJtPu1ubGWDzESseLtsM0p2WA9kwY2ZJUBLdpaWjgeoQj0wFgWeyBtL3/N/G/ i/Ieon2bZqXfrwfCGwyoI2GRoEjb1+/gTw/YfHSD+TTASg9hwj2CWFv+FcPq99EAaa3I Ff2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754535762; x=1755140562; 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=AGJl2OLVP0duXC1zwNrWBF5NGjyjTBj3eGAEZ+bR7YDWGbuzYbauc0BXI6HbkPIU4o cjFFNoZWZfQLD56LoKLoSa5p70AgzcBniNitNH0Tsnky5ZmhM8JZLcQxTPT8LjSwIa9u RcWDOR7l9XuzsURQYHXv/Vdl/Z/vZrExSQski2HNreNBztKdnSBubxXfqvHbbO6FuX+N J+0PUTwx/Kd953V5dT9gJ1d3v+BTdILfidI+o8wt/M2z9nxeUCvT2oNNFt15uxN/K0Em sThpyGsNV/erre5NTyexf6gsA87T7/eMF79osYfuKGwqJvuImMKhdF2Gc3I4bjki/OXA dt/Q== X-Gm-Message-State: AOJu0Yz/rMMayM/OWiYz/A5Ii0zrHGK9WpYjTUytimbDdZI1cJBVSVqq ZXdD7xhskbz8pN0OORxckA5Jl5c+JQS0+nKuagqGp0sq6ZDFg56ufli/sYiHRw== X-Gm-Gg: ASbGncvTrTdmhYLgzyWF8JCFwhlHAsDDOkTEvbbSU19HincfWqjGrC9GK811JBeXusR 7ZiCxyOj1tYtgrwHlaf3AWhXzk5IlCHSSkVsTBddcTmVB6YazIFI+UBSIowtJ7g0HA2DmGPa9wO 36PTuEXGSwpNcorugMV5nCXKNo4whwCOeA8bFVtB0aSeHST/phIf95R2k/YJuTd/dhkXMzTh/0b GbJbnO3LKiGMALL3+8gJ4c6kOPGqCXIOdkhzSwuLIlfeCSBtZ7GbkZN4wSd8YAFS2+6vM3dmmpC R4Q0KLBktR8eySqjJqZ3CjYX5iL0e3xDCMKWohn4YDw2wGtWnhj2RFHqn5kvSRHRlvQWj0RBFeM xEOv3OeKu2nja8zBTOQqjZg== X-Google-Smtp-Source: AGHT+IGYPOBKzfPnZYzxTD/JeBtsCGGBmHMl5CEfmX10XVJXSWTAHsUelalGnAzLuXoGknD0x/eOQw== X-Received: by 2002:a17:902:f78a:b0:231:d0da:5e1f with SMTP id d9443c01a7336-242b0704556mr25742275ad.21.1754535762170; Wed, 06 Aug 2025 20:02:42 -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 v3 1/4] meson: Add wasm64 support to the --cpu flag Date: Thu, 7 Aug 2025 12:02:00 +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::536; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pg1-x536.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: 1754535864522124100 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=1754535864; cv=none; d=zohomail.com; s=zohoarc; b=m8/aGvXENJ3KhxddKBkdkVTmJLWc5OLYUHURPQbNdLGCpJ3RqMiYvgrIYBFIYO18uLBPo+U+Rgl5SrFUJ2sUz4BgvIDc8RHj5X6CwafkPaOddxrEV38c3UgstAHG5k3h59uni6dSHxhjQVQQlpkhOHR6G0SAtqPqrCwAQ9WNsY0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754535864; h=Content-Type: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=hox/JubKo6/V4q4RB3YlZQj7BLFXBniITJvVoESyKgw=; b=nmNhPk9DdOzVTsSzu6jBENFkX0DLfODy5/Vk5hqlESlsKU3ao3RTmqne0002lTiywNCCTQN9uMGe6YN/Jir4bX1hyhmPtzbNyFOVwmUDkYUGyNSbQjE7tMGij6RBHNu3riYXBV1FWlvoEOBs6/XV2yasZaiMnc0obehMwZzpMdA= 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 1754535864232867.0099591585002; Wed, 6 Aug 2025 20:04:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujquP-0007rd-GZ; Wed, 06 Aug 2025 23:03:14 -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 1ujqu8-0007kA-O9 for qemu-devel@nongnu.org; Wed, 06 Aug 2025 23:02:58 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujqu2-0002Cb-Ph for qemu-devel@nongnu.org; Wed, 06 Aug 2025 23:02:54 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-23fe2be6061so3902745ad.0 for ; Wed, 06 Aug 2025 20:02:46 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:81e2:9f1d:777a:7b46]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1ef6ac6sm173154585ad.1.2025.08.06.20.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 20:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754535766; x=1755140566; 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=hox/JubKo6/V4q4RB3YlZQj7BLFXBniITJvVoESyKgw=; b=kyOGwx7h+lMyOVuQRSbb+4wljWnIjldgZHeGT7dQZ5ezLQS0FRzMi0J6hCybF+PfYE tlFAifKpW8RAMfc4MW8fp+65O9xSQ2pFRa67Df5gUS95FybRb9jjTxuFUbSQ2vyyKqiW biOEm1vjGkQ+E+IOr1uW5fIXD0GJehJW3CCorbPQlI6AWmz30tub4XCQZi9WKmbbhcPV gVq1oM+pyRX1Hga3q0zZit/vWZUEHjhiTMn85SYVOjo/NGgbyOBHmI7Ex2LPTODN/qNb TcHFTew1jsntIFvhNp1eYT6IhfB8GurGPZgo6O5MT0dz96MBCBoXOLb7cpdrlKLnt6Nx bNBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754535766; x=1755140566; 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=hox/JubKo6/V4q4RB3YlZQj7BLFXBniITJvVoESyKgw=; b=i0jwsIFLi2Pamolwl18z3XlEMa23WIlphbGNhDRDs1KJjXsQ5xwUPQaNXG1e0YPIwZ fKGu7f8hLQooxzieQioLywwSokPWXF0KPon48E/5x8fIIFn0v3USkCQUcK08JaIQx7ud ullVzqbLqNC/STLdvZs+trSdq4VWAsu5ERqwmuFfqFy54Tt/l4ImLTm3sZIG1T28znJa qnC896L7biDt3mDQR/smITT5eEk06dujFkJWAa5RoLk7FMfNCS7Cweok2Ue68HV97JPC oAX2m5HRO8KiBSmnkwtAxvc4sOIwETp29RcTdwT6oQ1fNtQYsdE6aU9Cu1Dj7ERR5AxY qYfg== X-Gm-Message-State: AOJu0YyxoD2ipR/IRieZftcQWtAvmb0QFj7m34viUIgMIY6wCCOdtxuu VX2FqCO5ceY8TW424TaJHP4tdvNXN2PSZedjaoIBlrry9cTRQWwYg6rmSVFDpw== X-Gm-Gg: ASbGnct3sFyi8RGz3EdkNYDy3jugb13QvRoAyrMTjRokXKwGXLgovI5lsl6ZQ50RJLY diQ9Y8rpLExIntHXI281YYGPEYZRfjW0i+PFXcCijIVozTT4MFIEFoS+4TGKTOUWKTJ2gHdqL4k PnL2SjIdGtNkGuwyA8f6dMGBQYhMC4RsanTebSB5hcjCWKutSAbCPSwT7Wbt7Kf5o0a+K/IWOyt BsGukilIQN9Xza3/+TDI3Gb4i99YjUKC5YmVZa2vp8qsFrSziqhSf3U2Ew6MOQ+4Skjqg+KNGga LHGZJ3NWyiv3l9GwAD55LXSaneAB1fSCIrwu7BDBo10i0pgKzw5CFteFcV0LlvVkibI/QgMC52n dehDU9ELh5KAa6WM2znE7TA== X-Google-Smtp-Source: AGHT+IHLQI2Ocyx0VbIDh14jWYebKsG+DqMKpojzTbVGSngXhTnAvGvOB9ehPRgDFB5YpGIkwED0YQ== X-Received: by 2002:a17:902:ef0a:b0:240:3245:6d40 with SMTP id d9443c01a7336-242b04d6139mr25838435ad.0.1754535765512; Wed, 06 Aug 2025 20:02:45 -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 v3 2/4] configure: Enable to propagate -sMEMORY64 flag to Emscripten Date: Thu, 7 Aug 2025 12:02:01 +0900 Message-ID: <574dee5a5cb19d15dbfbe94cea31de23189596a9.1754534225.git.ktokunaga.mail@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::635; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pl1-x635.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: 1754535866037116600 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(-) 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=1754535844; cv=none; d=zohomail.com; s=zohoarc; b=cwCxtBTAtbJQG8POIwWwtc/ymDg7klQLGYkAQUWpHheEWGbI3PF/EniHKKVkhyxwKY3gFgY14wP3ptMTtELPBuHCF/e1/QEeZwllmgE9ZIGx+NzBQ1NSB1Tvhbz6QIzMfr0deHaqEc1KyYz28c6nsXym1AbN2MKkkh6PygWv6PU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754535844; 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=OSHHeXJ5pQ/pds33f7uxkAAtdsPtzNZfbsdFAEkCQbBFNQFjGPe3hO33WvxqUmlBlKEODCelChOKI0ejTEsvpnMWwmIb/jO03zgDPTfEzM3LeuRz7qxDJ4jYFKhJrbUwqYwGwiogSwT2112Qkwh9E/dX2YzQqR2q1YiBzZ+7bh4= 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 1754535844100942.1859518921539; Wed, 6 Aug 2025 20:04:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujquS-0007vG-6f; Wed, 06 Aug 2025 23:03:16 -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 1ujqu8-0007k9-Nu for qemu-devel@nongnu.org; Wed, 06 Aug 2025 23:02:58 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujqu3-0002IN-U6 for qemu-devel@nongnu.org; Wed, 06 Aug 2025 23:02:54 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-b34a6d0c9a3so531513a12.3 for ; Wed, 06 Aug 2025 20:02:50 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:81e2:9f1d:777a:7b46]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1ef6ac6sm173154585ad.1.2025.08.06.20.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 20:02:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754535769; x=1755140569; 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=BKsOLxx5PWrs5ILSsqWCXYpLombax7Or0zjWNuA7eAgqKXnU+UmP4RlNNidHEOc3xV hbfOOjlYwolh6wDfZq6DoycvaRe9Kv7NeCrnSQ127/N8tP1Z6hlC3+Z7DowLStHppXtk 6KCbyBjil4sn7TXSeriYuV37Hvc/mwKclfS5PXc1+aXw2Y1sB9X20UCdBQvx+QHFufq6 FhFXT7w+5YWIk8kuZ7h93Ka9VmPHS0gA4LkOrmbK7g8yluEuPh5OF0qmKxK7U30OnuA2 qEf5VhoJtoHwp7dbBlOg4aoXdfEVkehwrLDRODOoO9axXuBztNplzpopO2jDCh5ucz7Y yR9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754535769; x=1755140569; 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=BeMKELgsniHwdDz0jczHPVorLd4tizeTX0VlOAKgV4t3+Xo72DR0vpv6/gdsETfSrq 96fzAHx/dv+ATAmaRN4d0Ha8WrKwgH0UWbtyPcS9lWxR/VRoQX/emyVBSqvztvt+tzHK wWSfToK6cvVPEGb4Efaacy4DTJaQnHZd2xxhGZ4jCJBm6owhqbUvXFHBoARzBlpDca53 Lie7HeZU3YgDWjkApS16qUDjyZteZHVZfEDgmZZuqJ130goS928H4+AWv16J87ajWkJQ iz0Jt357vwHyAQhvH0W1sS2c+z7YMcKx+0YRd2gGqOHH3TQSI1iXvWghnOl1XJ86sdS+ IYQA== X-Gm-Message-State: AOJu0Yw8Kf9qt45unG4YL9DMyEFLbLFytf38uan1WROasLSP3kxIKqIP 6IyIKlT6Fih54gmMe/MkztFzDRlurvOvrYeQarzb+IE4908qPUSbkKCDIITvEA== X-Gm-Gg: ASbGncud1VLI3hXtvWKY9MBApzwiDhqETSHxVEptUQtaRhpYkAr0N0Jsx5LRavpNKu5 1dyfPru4PpBuoJb+QfBAdDMTfJv60BKObDIfKnptV7CIXtdD0R4wsKl2AaFOFQGK9ei4vUblPcT TPiavNBxAUa7N+OTaQfg9FT+cLpnENVL3wRlH6Ht481+NwVF3VmTyuvvZUFPDFX9ubSOuEY7Iwp 9OpppIvUk1sB3DDWxwD5Q6MOdGX+8SZtYAssTZQrP1twyJ0+Clzkc/sVsiDQUjKnm2UxA9F7Aey IbK8JV4z3JB1OR934saMuM2e2CSCWVdODg8x/5xPTG0dBj3hrnve0fEG+B+fo5pyeOlINGPQ6Dw f2ZqwKC+pKPthZd1/OpnjyDeYbRKzkQYm X-Google-Smtp-Source: AGHT+IG9i/jBc35U7sABGPGaOcHa2S53whkpuFMkbi5OnXE7zJqQEZlDP1ID/7Vp3cjb+k2wcCU2hw== X-Received: by 2002:a17:903:ac6:b0:240:7f7d:2b57 with SMTP id d9443c01a7336-2429f4ae04fmr52416815ad.28.1754535768800; Wed, 06 Aug 2025 20:02: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 v3 3/4] dockerfiles: Add support for wasm64 to the wasm Dockerfile Date: Thu, 7 Aug 2025 12:02:02 +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::52a; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pg1-x52a.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: 1754535846248116600 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=1754535841; cv=none; d=zohomail.com; s=zohoarc; b=aj/pcH6OstoSvsFM6sbbrxSUXbhavf4wUdSNHqlSCcrzmpFYuCZSorPylLemoJ/fY3Flf22YhPYjPBVI2mJkTrolDLAD+gSLdIpjS4zX2yLirP4YMQiW42eIKbxBNLWv3Eux8HWaznurI6mWGJk3w6gYI6xwF8zXCth/u33AzGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754535841; 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=iqZKDhwtkLC/tHYUZBs2eggDgvqJxQq19A0deinJjBI=; b=jCFYChvKepbBDhJnqO5qe66f4YYvDsXTYGEnt7/W7oJk8gU65VQthjInLJH2K5XpowTOkUUdYFYctHUUtHIt8RSKHmXiRfHLdfD7u2Puemt/oXdpT66k7tkBfd894htarGdfDJURr5YkN/rvEFADiTHjLcj8BQLKQG2xofGzhdQ= 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 1754535841349837.5758874453571; Wed, 6 Aug 2025 20:04:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujquS-0007xX-UC; Wed, 06 Aug 2025 23:03:17 -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 1ujquN-0007qw-LQ for qemu-devel@nongnu.org; Wed, 06 Aug 2025 23:03:12 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujqu5-0002P1-W6 for qemu-devel@nongnu.org; Wed, 06 Aug 2025 23:02:57 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-7425bd5a83aso578767b3a.0 for ; Wed, 06 Aug 2025 20:02:53 -0700 (PDT) Received: from ktock.. ([240d:1a:3b6:8b00:81e2:9f1d:777a:7b46]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1ef6ac6sm173154585ad.1.2025.08.06.20.02.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 20:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754535772; x=1755140572; 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=iqZKDhwtkLC/tHYUZBs2eggDgvqJxQq19A0deinJjBI=; b=PvLDHskurSKK7t0jVK+wv5pYDwNPnU2a9c3TzKjeI10bzaBjPm9of/MwuKE9JsYTVG O1uRq0hfzY6mrV+d2XgB4c/Yz7Wz/hqaaqZHUhrWapeZM9KpumjQv06d9NnAD5mCRWvv KBTw/CSqjWl0HRRhtP06MvrgSdoGCFwH8z/kLRfJZJ5q8VnLtXhZ2hqZEl6DO/CP+uPj GB4zlt7B1ALMb1OuSl/LR7B5CN8yw4OFSPsNxzAzocstXAT6O5SPiiz3L93aQe7cttXT 5xVuMziPkoV64BjmBNa8SYJrbdz4zocTt9pOCqQfKjvm7GXtPq0w29q0tbvqH6mLC7ie oiYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754535772; x=1755140572; 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=iqZKDhwtkLC/tHYUZBs2eggDgvqJxQq19A0deinJjBI=; b=sCYFkz0fMLzLrR9XIPhD2wYU1HpgWtCesCDI9nZPJXOX3U+Mku0gPuXLGAdTiSBhht emcFknZZOyBuSE0BH0+epI5YZWsg8lkfjAl2HK+OU0+4oiC6PhHFe5rjEUn6rErmQa1p THkDt/gizRLnmU/6NnKsfUi7zYwCOJWEPaPnkgLJntUwivcaCWa22KbL+H8o9fqcS7Ny Wb/qQ6Q50o2gXWlOGnqT/q78UMU3p9O03SyiC64t2/p32MFEuSqg4c3AepK6voVDLPbQ P6OzOSnka1WI7oOjepwOiA3VIAlR7L+Rklz+ELPeU91GbP4bWVIfS2vCbrlcfRpkFRV+ 8zOg== X-Gm-Message-State: AOJu0YzagVPQI2AyEZxXIOJzsI9tPEHSFN0fRuA5J38mnBoprgA/Bc7z 3IDStyiVuFNLuzEQpRz3tO5+nwM6q8efUfoM0ulpXF4xwQg0/9ygU5aD9Zet4A== X-Gm-Gg: ASbGncskLMHh9xOHmiMCu9GuIiiXWd9CMM0yzuiLKFmFIX3CgvPJn3Y6TzSbdnpwWQN kr6NDwoeJWJvDrzVrKM1UKzSSKjYdannfYvFWiDmtYOUxiLM9li8jN6sttNOhAUB2IDNqM31wIu RvRJeIMXOdsg+pkGWwUrlubar/EzQw2l5SCBVzCxLUAWeiWv4UiUY4buuaua9YbRkswQ6emtFHK gtkYPMa+NwQfb5Gu8EkfSSPe1UsQK06/IbHFMC6uQoQ5Z9MxirUOQIkw/xo2wyGfqSAzArE1umI 5/0G7LCla4I1In16mh1bqF2OJXIPEIPDxC2ipL68rfXf2EM/F9b5jSDmWd/ugJg+4L8XQIMU5IM BXlWcVCWkFmVwBM9R8v4qzA== X-Google-Smtp-Source: AGHT+IFf88P460IRUHcmvQ8QNE1dy7ChKC/k+eKZ6PsDEavr1VndIMAZRY4uAGB54Y1c1AN7l+LIwQ== X-Received: by 2002:a17:902:c94d:b0:240:1f19:d35c with SMTP id d9443c01a7336-242a0bb5554mr73466095ad.39.1754535772342; Wed, 06 Aug 2025 20:02:52 -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 v3 4/4] .gitlab-ci.d: Add build tests for wasm64 Date: Thu, 7 Aug 2025 12:02:03 +0900 Message-ID: <85c09a7c387d8fb9bbcd5b887c3d219c59a0807b.1754534225.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::430; envelope-from=ktokunaga.mail@gmail.com; helo=mail-pf1-x430.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: 1754535842329124100 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 | 26 ++++++++++++++++++++++---- .gitlab-ci.d/container-cross.yml | 20 ++++++++++++++++++-- .gitlab-ci.d/container-template.yml | 4 +++- 3 files changed, 43 insertions(+), 7 deletions(-) V3: - Renamed the build tests on GitLab CI("build-wasm32" -> "build-wasm32-32bit", "build-wasm-wasm64" -> "build-wasm64-64bit", "build-wasm-wasm64l" -> "build-wasm64-32bit"). The same change has also been applied to container-cross.yml. diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d888a60063..77ae8f8281 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-32bit: extends: .wasm_build_job_template timeout: 2h needs: - job: wasm-emsdk-cross-container + job: wasm32-32bit-emsdk-cross-container variables: - IMAGE: emsdk-wasm32-cross - CONFIGURE_ARGS: --static --disable-tools --enable-debug --enable-tcg-i= nterpreter + IMAGE: emsdk-wasm32-32bit-cross + CONFIGURE_ARGS: --static --cpu=3Dwasm32 --disable-tools --enable-debug= --enable-tcg-interpreter + +build-wasm64-64bit: + extends: .wasm_build_job_template + timeout: 2h + needs: + job: wasm64-64bit-emsdk-cross-container + variables: + IMAGE: emsdk-wasm64-64bit-cross + CONFIGURE_ARGS: --static --cpu=3Dwasm64 --disable-tools --enable-debug= --enable-tcg-interpreter + +build-wasm64-32bit: + extends: .wasm_build_job_template + timeout: 2h + needs: + job: wasm64-32bit-emsdk-cross-container + variables: + IMAGE: emsdk-wasm64-32bit-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..84c4be49f4 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-32bit-emsdk-cross-container: extends: .container_job_template variables: - NAME: emsdk-wasm32-cross + NAME: emsdk-wasm32-32bit-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm32 + DOCKERFILE: emsdk-wasm-cross + +wasm64-64bit-emsdk-cross-container: + extends: .container_job_template + variables: + NAME: emsdk-wasm64-64bit-cross + BUILD_ARGS: --build-arg TARGET_CPU=3Dwasm64 --build-arg WASM64_MEMORY6= 4=3D1 + DOCKERFILE: emsdk-wasm-cross + +wasm64-32bit-emsdk-cross-container: + extends: .container_job_template + variables: + NAME: emsdk-wasm64-32bit-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