OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tcg: Use HAVE_CMPXCHG128 instead of CONFIG_CMPXCHG128

Browse Source 
We adjust CONFIG_ATOMIC128 and CONFIG_CMPXCHG128 with
CONFIG_ATOMIC128_OPT in atomic128.h.  It is difficult
to tell when those changes have been applied with the
ifdef we must use with CONFIG_CMPXCHG128.  So instead
use HAVE_CMPXCHG128, which triggers -Werror-undef when
the proper header has not been included.

Improves tcg_gen_atomic_cmpxchg_i128 for s390x host, which
requires CONFIG_ATOMIC128_OPT.  Without this we fall back
to EXCP_ATOMIC to single-step 128-bit atomics, which is
slow enough to cause some tests to time out.

Reported-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-07-13 20:06:15 +00:00
parent deba78709a
commit 76f9d6ad19
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accel/tcg/atomic_common.c.inc
View File

@ -41,7 +41,7 @@ CMPXCHG_HELPER(cmpxchgq_be, uint64_t)
CMPXCHG_HELPER(cmpxchgq_le, uint64_t) CMPXCHG_HELPER(cmpxchgq_le, uint64_t)
#endif #endif
#ifdef CONFIG_CMPXCHG128 #if HAVE_CMPXCHG128
CMPXCHG_HELPER(cmpxchgo_be, Int128) CMPXCHG_HELPER(cmpxchgo_be, Int128)
CMPXCHG_HELPER(cmpxchgo_le, Int128) CMPXCHG_HELPER(cmpxchgo_le, Int128)
#endif #endif

2
accel/tcg/cputlb.c
View File

@ -3105,7 +3105,7 @@ void cpu_st16_mmu(CPUArchState *env, target_ulong addr, Int128 val,
#include "atomic_template.h" #include "atomic_template.h"
#endif #endif
#if defined(CONFIG_ATOMIC128) || defined(CONFIG_CMPXCHG128) #if defined(CONFIG_ATOMIC128) || HAVE_CMPXCHG128
#define DATA_SIZE 16 #define DATA_SIZE 16
#include "atomic_template.h" #include "atomic_template.h"
#endif #endif

2
accel/tcg/tcg-runtime.h
View File

@ -58,7 +58,7 @@ DEF_HELPER_FLAGS_5(atomic_cmpxchgq_be, TCG_CALL_NO_WG,
DEF_HELPER_FLAGS_5(atomic_cmpxchgq_le, TCG_CALL_NO_WG, DEF_HELPER_FLAGS_5(atomic_cmpxchgq_le, TCG_CALL_NO_WG,
i64, env, i64, i64, i64, i32) i64, env, i64, i64, i64, i32)
#endif #endif
#ifdef CONFIG_CMPXCHG128 #if HAVE_CMPXCHG128
DEF_HELPER_FLAGS_5(atomic_cmpxchgo_be, TCG_CALL_NO_WG, DEF_HELPER_FLAGS_5(atomic_cmpxchgo_be, TCG_CALL_NO_WG,
i128, env, i64, i128, i128, i32) i128, env, i64, i128, i128, i32)
DEF_HELPER_FLAGS_5(atomic_cmpxchgo_le, TCG_CALL_NO_WG, DEF_HELPER_FLAGS_5(atomic_cmpxchgo_le, TCG_CALL_NO_WG,

2
accel/tcg/user-exec.c
View File

@ -1433,7 +1433,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, vaddr addr, MemOpIdx oi,
#include "atomic_template.h" #include "atomic_template.h"
#endif #endif
#if defined(CONFIG_ATOMIC128) || defined(CONFIG_CMPXCHG128) #if defined(CONFIG_ATOMIC128) || HAVE_CMPXCHG128
#define DATA_SIZE 16 #define DATA_SIZE 16
#include "atomic_template.h" #include "atomic_template.h"
#endif #endif

2
include/exec/helper-proto-common.h
View File

@ -7,6 +7,8 @@
#ifndef HELPER_PROTO_COMMON_H #ifndef HELPER_PROTO_COMMON_H
#define HELPER_PROTO_COMMON_H #define HELPER_PROTO_COMMON_H
#include "qemu/atomic128.h" /* for HAVE_CMPXCHG128 */
#define HELPER_H "accel/tcg/tcg-runtime.h" #define HELPER_H "accel/tcg/tcg-runtime.h"
#include "exec/helper-proto.h.inc" #include "exec/helper-proto.h.inc"
#undef HELPER_H #undef HELPER_H

2
tcg/tcg-op-ldst.c
View File

@ -778,7 +778,7 @@ typedef void (*gen_atomic_op_i64)(TCGv_i64, TCGv_env, TCGv_i64,
#else #else
# define WITH_ATOMIC64(X) # define WITH_ATOMIC64(X)
#endif #endif
#ifdef CONFIG_CMPXCHG128 #if HAVE_CMPXCHG128
# define WITH_ATOMIC128(X) X, # define WITH_ATOMIC128(X) X,
#else #else
# define WITH_ATOMIC128(X) # define WITH_ATOMIC128(X)