From nobody Sun Jan 11 01:19:00 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1767850654; cv=none; d=zohomail.com; s=zohoarc; b=Ma/QHWtLnBlCf1pYfg5q2rQzD6ll9g2z6sEX8PYGRKovXyXXlUDgMCpJNBHUTczPyrDqchANuWxJTs64l+lBxvyi/lTpCVJpp1GbJpISek5llsW3uJlbRrbn4kKtyuJrTF+FhhWV501F0eWkY6YuEiV/yqE9kK4E7QlcR1SFjsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767850654; h=Content-Transfer-Encoding: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:Cc; bh=u8+rTnkXkDUtFCw2q+QSvHQLDZV/Kh3FfwCQMjynnsY=; b=PwBIv8Yr34tTOAxSMrNMeJl56gpVpiqQ8W9ZyVVTiqD4j9TOE5O17GcHxsxGzg5FbChSlBLF9q3EUWMQI+L8PwYPtW0TpzIzFlgzr2ZbkmmupdcfQKcGtDJ8M74jgzL5dftXPPHc6iM5KbOTz8TY6thQRJmMWrEESo+j+TDQMzY= 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 1767850654400287.5845602466452; Wed, 7 Jan 2026 21:37:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdieV-0001GM-P9; Thu, 08 Jan 2026 00:33:43 -0500 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 1vdicT-00086N-R3 for qemu-devel@nongnu.org; Thu, 08 Jan 2026 00:31:39 -0500 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vdicR-0005bs-Jy for qemu-devel@nongnu.org; Thu, 08 Jan 2026 00:31:37 -0500 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-bc09b3d3afeso1201886a12.0 for ; Wed, 07 Jan 2026 21:31:35 -0800 (PST) Received: from stoup.. ([180.233.125.201]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c4cc05cd9d9sm7036552a12.16.2026.01.07.21.31.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 21:31:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767850294; x=1768455094; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=u8+rTnkXkDUtFCw2q+QSvHQLDZV/Kh3FfwCQMjynnsY=; b=igx19PT0wFNB+qDYhTnwdAutBIV99n7z338seutf1rrwFO2SWrkwF5Wuyu9LEsMuxg 65N+mqj3rvMTWsBYKblzdYEDJJNfCl28+K+rnIhyYv3KfX18f/nL++G/s6R+hKV2VA7O W2YlEAqA+vTsghGOVHG8kSHlyJObshKkJlYV2odxbzQbnuvrzP3LZq14lsyDGUJCrDza tLMjz4rz/efThDmE2ElqTlxiy29b16eC/RHtZCyCl1uoZUIsllqgXItok8jqmbmc4zFH qbuYASBsW9TSkArhvWhT0oflqdAwKfzFYaD1Q35qDTY4vjv6QqiK0mYCzvIjQZ4RoQkm 9pVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767850294; x=1768455094; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=u8+rTnkXkDUtFCw2q+QSvHQLDZV/Kh3FfwCQMjynnsY=; b=tnSwON7rmHfxbwPw+8fvE2ZEjxd1H2JrYL1Meg6W0betYulE/Nel4p9iiJziLPCdu3 p0tdDUGp46Vw6P7dfU4D6Nzxwg+jyB7iJnalmH/2nl/kmUW+UgufxIhj4tmTaikkXbkz TjA8z2IGT1g+9MemqqGwTF1wnYcOOZmAwdAIYk00+fZoe3s43jpo4eyxd/nGGYsdbiyJ o7Xvtbn21x4kWchBck90lcGwAjVfESORKNnVsuM7w8W+2ikaAX+V9s5X+AJdeyM5/pIh 1n6LuKCK/+T5VMgo1uhQ1I6AnzPBHAQzvFfimSqnn9LCUQfdZW2vRZrVPbmU6wY9A/5E P1rw== X-Gm-Message-State: AOJu0YzHyqpitOgpsM4SkFyN6Szsj24wCceGtiu1OtDZzomYwupxarGk hPvGCQAfI7WRPwkP9gQRr858Z+PwuzAxbzP+XIB+c8B80BcTDHNK1Be0YAMbS/b57cQPh/kmBms rWUidUKM= X-Gm-Gg: AY/fxX6NN6gpXgBRuXw9Z6dHix1JDSvSbPdUlKASQSCbyC4wEEb2+R7j/S+lpPP/EaM /BdjMOdSO83TVrG24kxJFp+JR0I/EdtOBg9Qv3qyNTVZYgAdY4RnF3u0/nGPQxronmE2U/p4muA elucIxzR6RomKPANCBW56jtYtHXhI+xgpfEVYpuLayEkPo7w/bauGof6XS9TYjj28Mj3XRiQBl6 2v41dcwnS0XGDKApD+rd9xtFhfZl4+/vS0//NJn7LzIagqKb+srJlr2iZ+bza1zolX8gFJOxK3T rQwSkmA+YB0S1Jn4Fbigr6hshbU7qm+/RvTvoWECOmG9vkELgfNO0v40+jnAIdP9xeQrQY2ynOv ApkolvbbPLv4BA/rXmrEK/wC5sgv15XylkmbPE2Kg/7gfNU6vtcMDU/8fXgzW8ePGbNn4+b0PsY rz0zuTjr7IHeSrWxXQkA== X-Google-Smtp-Source: AGHT+IGeMSBpvs663rcfjFMRtnX4Zsa5NJaYSMBvECECccOt2jGfQ2SVaXqd5zwjgPzPojZdz3SVOA== X-Received: by 2002:a05:6a21:3381:b0:340:cc06:94f5 with SMTP id adf61e73a8af0-3898f953251mr4671947637.44.1767850293873; Wed, 07 Jan 2026 21:31:33 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 36/50] tcg: Unconditionally define atomic64 helpers Date: Thu, 8 Jan 2026 16:30:04 +1100 Message-ID: <20260108053018.626690-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260108053018.626690-1-richard.henderson@linaro.org> References: <20260108053018.626690-1-richard.henderson@linaro.org> 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 (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::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.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, 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 @linaro.org) X-ZM-MESSAGEID: 1767850656392158500 Content-Type: text/plain; charset="utf-8" CONFIG_ATOMIC64 is a configuration knob for 32-bit hosts. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- accel/tcg/tcg-runtime.h | 16 ---------------- include/accel/tcg/cpu-ldst-common.h | 9 --------- accel/tcg/cputlb.c | 2 -- accel/tcg/user-exec.c | 2 -- tcg/tcg-op-ldst.c | 17 ++++++----------- accel/tcg/atomic_common.c.inc | 12 ------------ 6 files changed, 6 insertions(+), 52 deletions(-) diff --git a/accel/tcg/tcg-runtime.h b/accel/tcg/tcg-runtime.h index dc89155c0f..0b832176b3 100644 --- a/accel/tcg/tcg-runtime.h +++ b/accel/tcg/tcg-runtime.h @@ -48,12 +48,10 @@ DEF_HELPER_FLAGS_5(atomic_cmpxchgl_be, TCG_CALL_NO_WG, i32, env, i64, i32, i32, i32) DEF_HELPER_FLAGS_5(atomic_cmpxchgl_le, TCG_CALL_NO_WG, i32, env, i64, i32, i32, i32) -#ifdef CONFIG_ATOMIC64 DEF_HELPER_FLAGS_5(atomic_cmpxchgq_be, TCG_CALL_NO_WG, i64, env, i64, i64, i64, i32) DEF_HELPER_FLAGS_5(atomic_cmpxchgq_le, TCG_CALL_NO_WG, i64, env, i64, i64, i64, i32) -#endif #if HAVE_CMPXCHG128 DEF_HELPER_FLAGS_5(atomic_cmpxchgo_be, TCG_CALL_NO_WG, i128, env, i64, i128, i128, i32) @@ -73,7 +71,6 @@ DEF_HELPER_FLAGS_4(atomic_fetch_oro_le, TCG_CALL_NO_WG, i128, env, i64, i128, i32) #endif =20 -#ifdef CONFIG_ATOMIC64 #define GEN_ATOMIC_HELPERS(NAME) \ DEF_HELPER_FLAGS_4(glue(glue(atomic_, NAME), b), \ TCG_CALL_NO_WG, i32, env, i64, i32, i32) \ @@ -89,19 +86,6 @@ DEF_HELPER_FLAGS_4(atomic_fetch_oro_le, TCG_CALL_NO_WG, TCG_CALL_NO_WG, i64, env, i64, i64, i32) \ DEF_HELPER_FLAGS_4(glue(glue(atomic_, NAME), q_be), \ TCG_CALL_NO_WG, i64, env, i64, i64, i32) -#else -#define GEN_ATOMIC_HELPERS(NAME) \ - DEF_HELPER_FLAGS_4(glue(glue(atomic_, NAME), b), \ - TCG_CALL_NO_WG, i32, env, i64, i32, i32) \ - DEF_HELPER_FLAGS_4(glue(glue(atomic_, NAME), w_le), \ - TCG_CALL_NO_WG, i32, env, i64, i32, i32) \ - DEF_HELPER_FLAGS_4(glue(glue(atomic_, NAME), w_be), \ - TCG_CALL_NO_WG, i32, env, i64, i32, i32) \ - DEF_HELPER_FLAGS_4(glue(glue(atomic_, NAME), l_le), \ - TCG_CALL_NO_WG, i32, env, i64, i32, i32) \ - DEF_HELPER_FLAGS_4(glue(glue(atomic_, NAME), l_be), \ - TCG_CALL_NO_WG, i32, env, i64, i32, i32) -#endif /* CONFIG_ATOMIC64 */ =20 GEN_ATOMIC_HELPERS(fetch_add) GEN_ATOMIC_HELPERS(fetch_and) diff --git a/include/accel/tcg/cpu-ldst-common.h b/include/accel/tcg/cpu-ld= st-common.h index 17a3250ded..f12be8cfb7 100644 --- a/include/accel/tcg/cpu-ldst-common.h +++ b/include/accel/tcg/cpu-ldst-common.h @@ -60,7 +60,6 @@ TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \ (CPUArchState *env, vaddr addr, TYPE val, \ MemOpIdx oi, uintptr_t retaddr); =20 -#ifdef CONFIG_ATOMIC64 #define GEN_ATOMIC_HELPER_ALL(NAME) \ GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ @@ -69,14 +68,6 @@ TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \ GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) \ GEN_ATOMIC_HELPER(NAME, uint64_t, q_le) \ GEN_ATOMIC_HELPER(NAME, uint64_t, q_be) -#else -#define GEN_ATOMIC_HELPER_ALL(NAME) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) -#endif =20 GEN_ATOMIC_HELPER_ALL(fetch_add) GEN_ATOMIC_HELPER_ALL(fetch_sub) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index c30073326a..a6774083b0 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2886,10 +2886,8 @@ static void do_st16_mmu(CPUState *cpu, vaddr addr, I= nt128 val, #define DATA_SIZE 4 #include "atomic_template.h" =20 -#ifdef CONFIG_ATOMIC64 #define DATA_SIZE 8 #include "atomic_template.h" -#endif =20 #if defined(CONFIG_ATOMIC128) || HAVE_CMPXCHG128 #define DATA_SIZE 16 diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 1800dffa63..ddbdc0432d 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -1258,10 +1258,8 @@ static void *atomic_mmu_lookup(CPUState *cpu, vaddr = addr, MemOpIdx oi, #define DATA_SIZE 4 #include "atomic_template.h" =20 -#ifdef CONFIG_ATOMIC64 #define DATA_SIZE 8 #include "atomic_template.h" -#endif =20 #if defined(CONFIG_ATOMIC128) || HAVE_CMPXCHG128 #define DATA_SIZE 16 diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c index 55bfbf3a20..354d9968f9 100644 --- a/tcg/tcg-op-ldst.c +++ b/tcg/tcg-op-ldst.c @@ -825,11 +825,6 @@ typedef void (*gen_atomic_op_i64)(TCGv_i64, TCGv_env, = TCGv_i64, typedef void (*gen_atomic_op_i128)(TCGv_i128, TCGv_env, TCGv_i64, TCGv_i128, TCGv_i32); =20 -#ifdef CONFIG_ATOMIC64 -# define WITH_ATOMIC64(X) X, -#else -# define WITH_ATOMIC64(X) -#endif #if HAVE_CMPXCHG128 # define WITH_ATOMIC128(X) X, #else @@ -842,8 +837,8 @@ static void * const table_cmpxchg[(MO_SIZE | MO_BSWAP) = + 1] =3D { [MO_16 | MO_BE] =3D gen_helper_atomic_cmpxchgw_be, [MO_32 | MO_LE] =3D gen_helper_atomic_cmpxchgl_le, [MO_32 | MO_BE] =3D gen_helper_atomic_cmpxchgl_be, - WITH_ATOMIC64([MO_64 | MO_LE] =3D gen_helper_atomic_cmpxchgq_le) - WITH_ATOMIC64([MO_64 | MO_BE] =3D gen_helper_atomic_cmpxchgq_be) + [MO_64 | MO_LE] =3D gen_helper_atomic_cmpxchgq_le, + [MO_64 | MO_BE] =3D gen_helper_atomic_cmpxchgq_be, WITH_ATOMIC128([MO_128 | MO_LE] =3D gen_helper_atomic_cmpxchgo_le) WITH_ATOMIC128([MO_128 | MO_BE] =3D gen_helper_atomic_cmpxchgo_be) }; @@ -1235,8 +1230,8 @@ static void * const table_##NAME[(MO_SIZE | MO_BSWAP)= + 1] =3D { \ [MO_16 | MO_BE] =3D gen_helper_atomic_##NAME##w_be, \ [MO_32 | MO_LE] =3D gen_helper_atomic_##NAME##l_le, \ [MO_32 | MO_BE] =3D gen_helper_atomic_##NAME##l_be, \ - WITH_ATOMIC64([MO_64 | MO_LE] =3D gen_helper_atomic_##NAME##q_le) \ - WITH_ATOMIC64([MO_64 | MO_BE] =3D gen_helper_atomic_##NAME##q_be) \ + [MO_64 | MO_LE] =3D gen_helper_atomic_##NAME##q_le, \ + [MO_64 | MO_BE] =3D gen_helper_atomic_##NAME##q_be, \ WITH_ATOMIC128([MO_128 | MO_LE] =3D gen_helper_atomic_##NAME##o_le) \ WITH_ATOMIC128([MO_128 | MO_BE] =3D gen_helper_atomic_##NAME##o_be) \ }; \ @@ -1287,8 +1282,8 @@ static void * const table_##NAME[(MO_SIZE | MO_BSWAP)= + 1] =3D { \ [MO_16 | MO_BE] =3D gen_helper_atomic_##NAME##w_be, \ [MO_32 | MO_LE] =3D gen_helper_atomic_##NAME##l_le, \ [MO_32 | MO_BE] =3D gen_helper_atomic_##NAME##l_be, \ - WITH_ATOMIC64([MO_64 | MO_LE] =3D gen_helper_atomic_##NAME##q_le) \ - WITH_ATOMIC64([MO_64 | MO_BE] =3D gen_helper_atomic_##NAME##q_be) \ + [MO_64 | MO_LE] =3D gen_helper_atomic_##NAME##q_le, \ + [MO_64 | MO_BE] =3D gen_helper_atomic_##NAME##q_be, \ }; \ void tcg_gen_atomic_##NAME##_i32_chk(TCGv_i32 ret, TCGTemp *addr, \ TCGv_i32 val, TCGArg idx, \ diff --git a/accel/tcg/atomic_common.c.inc b/accel/tcg/atomic_common.c.inc index 1ff80d19fe..7d779dd51d 100644 --- a/accel/tcg/atomic_common.c.inc +++ b/accel/tcg/atomic_common.c.inc @@ -46,11 +46,8 @@ CMPXCHG_HELPER(cmpxchgw_be, uint32_t) CMPXCHG_HELPER(cmpxchgw_le, uint32_t) CMPXCHG_HELPER(cmpxchgl_be, uint32_t) CMPXCHG_HELPER(cmpxchgl_le, uint32_t) - -#ifdef CONFIG_ATOMIC64 CMPXCHG_HELPER(cmpxchgq_be, uint64_t) CMPXCHG_HELPER(cmpxchgq_le, uint64_t) -#endif =20 #if HAVE_CMPXCHG128 CMPXCHG_HELPER(cmpxchgo_be, Int128) @@ -64,7 +61,6 @@ CMPXCHG_HELPER(cmpxchgo_le, Int128) TYPE val, uint32_t oi) \ { return glue(glue(cpu_atomic_,OP),_mmu)(env, addr, val, oi, GETPC());= } =20 -#ifdef CONFIG_ATOMIC64 #define GEN_ATOMIC_HELPERS(OP) \ ATOMIC_HELPER(glue(OP,b), uint32_t) \ ATOMIC_HELPER(glue(OP,w_be), uint32_t) \ @@ -73,14 +69,6 @@ CMPXCHG_HELPER(cmpxchgo_le, Int128) ATOMIC_HELPER(glue(OP,l_le), uint32_t) \ ATOMIC_HELPER(glue(OP,q_be), uint64_t) \ ATOMIC_HELPER(glue(OP,q_le), uint64_t) -#else -#define GEN_ATOMIC_HELPERS(OP) \ - ATOMIC_HELPER(glue(OP,b), uint32_t) \ - ATOMIC_HELPER(glue(OP,w_be), uint32_t) \ - ATOMIC_HELPER(glue(OP,w_le), uint32_t) \ - ATOMIC_HELPER(glue(OP,l_be), uint32_t) \ - ATOMIC_HELPER(glue(OP,l_le), uint32_t) -#endif =20 GEN_ATOMIC_HELPERS(fetch_add) GEN_ATOMIC_HELPERS(fetch_and) --=20 2.43.0