From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [PATCH v2 21/27] accel/tcg: Eliminate #if on HAVE_ATOMIC128 and HAVE_CMPXCHG128
Date: Tue, 23 May 2023 06:47:27 -0700 [thread overview]
Message-ID: <20230523134733.678646-22-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230523134733.678646-1-richard.henderson@linaro.org>
These symbols will shortly become dynamic runtime tests and
therefore not appropriate for the preprocessor. Use the
matching CONFIG_* symbols for that purpose.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
host/include/aarch64/host/atomic128-cas.h | 2 ++
host/include/generic/host/atomic128-ldst.h | 2 +-
accel/tcg/cputlb.c | 2 +-
accel/tcg/user-exec.c | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/host/include/aarch64/host/atomic128-cas.h b/host/include/aarch64/host/atomic128-cas.h
index 80de58e06d..58630107bc 100644
--- a/host/include/aarch64/host/atomic128-cas.h
+++ b/host/include/aarch64/host/atomic128-cas.h
@@ -37,6 +37,8 @@ static inline Int128 atomic16_cmpxchg(Int128 *ptr, Int128 cmp, Int128 new)
return int128_make128(oldl, oldh);
}
+
+# define CONFIG_CMPXCHG128 1
# define HAVE_CMPXCHG128 1
#endif
diff --git a/host/include/generic/host/atomic128-ldst.h b/host/include/generic/host/atomic128-ldst.h
index 46911dfb61..06a62e9dd0 100644
--- a/host/include/generic/host/atomic128-ldst.h
+++ b/host/include/generic/host/atomic128-ldst.h
@@ -33,7 +33,7 @@ atomic16_set(Int128 *ptr, Int128 val)
}
# define HAVE_ATOMIC128 1
-#elif !defined(CONFIG_USER_ONLY) && HAVE_CMPXCHG128
+#elif defined(CONFIG_CMPXCHG128) && !defined(CONFIG_USER_ONLY)
static inline Int128 ATTRIBUTE_ATOMIC128_OPT
atomic16_read(Int128 *ptr)
{
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 9cb0b697d1..0bd06bf894 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -3038,7 +3038,7 @@ void cpu_st16_mmu(CPUArchState *env, target_ulong addr, Int128 val,
#include "atomic_template.h"
#endif
-#if HAVE_CMPXCHG128 || HAVE_ATOMIC128
+#if defined(CONFIG_ATOMIC128) || defined(CONFIG_CMPXCHG128)
#define DATA_SIZE 16
#include "atomic_template.h"
#endif
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 1e085b1210..dc8d6b5d40 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -1371,7 +1371,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr,
#include "atomic_template.h"
#endif
-#if HAVE_ATOMIC128 || HAVE_CMPXCHG128
+#if defined(CONFIG_ATOMIC128) || defined(CONFIG_CMPXCHG128)
#define DATA_SIZE 16
#include "atomic_template.h"
#endif
--
2.34.1
next prev parent reply other threads:[~2023-05-23 13:48 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 13:47 [PATCH v2 00/27] accel/tcg: Improvements to atomic128.h Richard Henderson
2023-05-23 13:47 ` [PATCH v2 01/27] util: Introduce host-specific cpuinfo.h Richard Henderson
2023-05-23 16:10 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 02/27] util: Add cpuinfo-i386.c Richard Henderson
2023-05-23 16:10 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 03/27] util: Add i386 CPUINFO_ATOMIC_VMOVDQU Richard Henderson
2023-05-23 16:13 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 04/27] tcg/i386: Use host/cpuinfo.h Richard Henderson
2023-05-23 16:14 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 05/27] util/bufferiszero: Use i386 host/cpuinfo.h Richard Henderson
2023-05-23 16:18 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 06/27] migration/xbzrle: Shuffle function order Richard Henderson
2023-05-23 16:19 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 07/27] migration/xbzrle: Use i386 host/cpuinfo.h Richard Henderson
2023-05-23 16:21 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 08/27] migration: Build migration_files once Richard Henderson
2023-05-23 16:26 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 09/27] util: Add cpuinfo-aarch64.c Richard Henderson
2023-05-23 16:28 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 10/27] include/host: Split out atomic128-cas.h Richard Henderson
2023-05-23 16:31 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 11/27] include/host: Split out atomic128-ldst.h Richard Henderson
2023-05-23 16:32 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 12/27] meson: Fix detect atomic128 support with optimization Richard Henderson
2023-05-23 16:32 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 13/27] include/qemu: Move CONFIG_ATOMIC128_OPT handling to atomic128.h Richard Henderson
2023-05-23 16:35 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 14/27] target/ppc: Use tcg_gen_qemu_{ld, st}_i128 for LQARX, LQ, STQ Richard Henderson
2023-05-23 16:37 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 15/27] target/s390x: Use tcg_gen_qemu_{ld, st}_i128 for LPQ, STPQ Richard Henderson
2023-05-23 13:50 ` David Hildenbrand
2023-05-23 16:59 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 16/27] accel/tcg: Unify cpu_{ld,st}*_{be,le}_mmu Richard Henderson
2023-05-23 16:40 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 17/27] target/s390x: Use cpu_{ld,st}*_mmu in do_csst Richard Henderson
2023-05-23 13:51 ` David Hildenbrand
2023-05-23 16:44 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 18/27] target/s390x: Always use cpu_atomic_cmpxchgl_be_mmu " Richard Henderson
2023-05-23 16:40 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 19/27] accel/tcg: Remove cpu_atomic_{ld,st}o_*_mmu Richard Henderson
2023-05-23 16:44 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 20/27] accel/tcg: Remove prot argument to atomic_mmu_lookup Richard Henderson
2023-05-23 16:46 ` Alex Bennée
2023-05-23 13:47 ` Richard Henderson [this message]
2023-05-23 16:47 ` [PATCH v2 21/27] accel/tcg: Eliminate #if on HAVE_ATOMIC128 and HAVE_CMPXCHG128 Alex Bennée
2023-05-23 13:47 ` [PATCH v2 22/27] qemu/atomic128: Split atomic16_read Richard Henderson
2023-05-23 16:49 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 23/27] accel/tcg: Correctly use atomic128.h in ldst_atomicity.c.inc Richard Henderson
2023-05-23 16:50 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 24/27] tcg: Split out tcg/debug-assert.h Richard Henderson
2023-05-23 16:52 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 25/27] qemu/atomic128: Improve cmpxchg fallback for atomic16_set Richard Henderson
2023-05-23 16:54 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 26/27] qemu/atomic128: Add runtime test for FEAT_LSE2 Richard Henderson
2023-05-23 16:57 ` Alex Bennée
2023-05-23 13:47 ` [PATCH v2 27/27] qemu/atomic128: Add x86_64 atomic128-ldst.h Richard Henderson
2023-05-23 16:59 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230523134733.678646-22-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).