tcg: philmd's queue
v2 cover tcg: philmd's queue
Hi Richard,
Here is my patch queue based on your tcg-next tree.
Missing review: 38, 41, 43 (all news)
Thanks,
Phil.
Since v1:
- Deferred warning change and updated desc (patches 40 & 42)
(skipping patches 1-37 because identical of v1:
https://lore.kernel.org/qemu-devel/[email protected]/)
Philippe Mathieu-Daudé (43):
tcg: Declare TARGET_INSN_START_EXTRA_WORDS in 'cpu-param.h'
tcg: Always define TARGET_INSN_START_EXTRA_WORDS hw/core/cpu: Update CPUClass::mmu_index docstring accel/tcg: Introduce TCGCPUOps::mmu_index() callback target/alpha: Restrict SoftMMU mmu_index() to TCG target/arm: Restrict SoftMMU mmu_index() to TCG target/avr: Restrict SoftMMU mmu_index() to TCG target/hppa: Restrict SoftMMU mmu_index() to TCG target/i386: Remove unused cpu_(ldub,stb)_kernel macros target/i386: Restrict cpu_mmu_index_kernel() to TCG target/i386: Restrict SoftMMU mmu_index() to TCG target/loongarch: Restrict SoftMMU mmu_index() to TCG target/m68k: Restrict SoftMMU mmu_index() to TCG target/microblaze: Restrict SoftMMU mmu_index() to TCG target/mips: Restrict SoftMMU mmu_index() to TCG target/openrisc: Restrict SoftMMU mmu_index() to TCG target/ppc: Restrict SoftMMU mmu_index() to TCG target/riscv: Restrict SoftMMU mmu_index() to TCG target/rx: Fix copy/paste typo (riscv -> rx)
target/rx: Restrict SoftMMU mmu_index() to TCG target/s390x: Restrict SoftMMU mmu_index() to TCG target/sh4: Restrict SoftMMU mmu_index() to TCG target/sparc: Restrict SoftMMU mmu_index() to TCG target/tricore: Restrict SoftMMU mmu_index() to TCG target/xtensa: Restrict SoftMMU mmu_index() to TCG hw/core/cpu: Remove CPUClass::mmu_index()
exec: Restrict cpu-mmu-index.h to accel/tcg/
exec: Restrict 'cpu-ldst-common.h' to accel/tcg/
exec: Restrict 'cpu_ldst.h' to accel/tcg/
exec: Do not include 'accel/tcg/cpu-ldst.h' in 'exec-all.h'
tcg: Always define TCG_GUEST_DEFAULT_MO
tcg: Simplify tcg_req_mo() macro
tcg: Define guest_default_memory_order in TCGCPUOps
tcg: Remove use of TCG_GUEST_DEFAULT_MO in tb_gen_code()
tcg: Propagate CPUState argument to cpu_req_mo()
tcg: Have tcg_req_mo() use TCGCPUOps::guest_default_memory_order
tcg: Remove the TCG_GUEST_DEFAULT_MO definition globally
tcg: Move cpu_req_mo() macro to target-agnostic 'backend-ldst.h'
tcg: Move qemu_tcg_mttcg_enabled() to 'system/tcg.h'
tcg: Convert TCGState::mttcg_enabled to TriState
tcg: Factor mttcg_init() out
tcg: Convert TARGET_SUPPORTS_MTTCG to TCGCPUOps::mttcg_supported field target/arm: Update comment around cpu_untagged_addr()
docs/devel/multi-thread-tcg.rst | 6 +-
configs/targets/aarch64-softmmu.mak | 1 -
configs/targets/alpha-softmmu.mak | 1 -
configs/targets/arm-softmmu.mak | 1 -
configs/targets/hppa-softmmu.mak | 1 -
configs/targets/i386-softmmu.mak | 1 -
configs/targets/loongarch64-softmmu.mak | 1 -
configs/targets/microblaze-softmmu.mak | 1 -
configs/targets/microblazeel-softmmu.mak | 1 -
configs/targets/mips-softmmu.mak | 1 -
configs/targets/mipsel-softmmu.mak | 1 -
configs/targets/or1k-softmmu.mak | 1 -
configs/targets/ppc64-softmmu.mak | 1 -
configs/targets/riscv32-softmmu.mak | 1 -
configs/targets/riscv64-softmmu.mak | 1 -
configs/targets/s390x-softmmu.mak | 1 -
configs/targets/sparc-softmmu.mak | 1 -
configs/targets/sparc64-softmmu.mak | 1 -
configs/targets/x86_64-softmmu.mak | 1 -
configs/targets/xtensa-softmmu.mak | 1 -
configs/targets/xtensaeb-softmmu.mak | 1 -
accel/tcg/backend-ldst.h | 41 +++++++++
accel/tcg/internal-common.h | 27 ++++++
accel/tcg/internal-target.h | 35 --------
bsd-user/qemu.h | 2 +-
include/{exec => accel/tcg}/cpu-ldst-common.h | 6 +-
.../{exec/cpu_ldst.h => accel/tcg/cpu-ldst.h} | 10 +--
include/{exec => accel/tcg}/cpu-mmu-index.h | 9 +-
include/accel/tcg/cpu-ops.h | 19 +++++
include/exec/exec-all.h | 3 -
include/exec/poison.h | 1 -
include/hw/core/cpu.h | 12 ---
include/system/tcg.h | 8 ++
include/tcg/insn-start-words.h | 4 -
include/tcg/tcg-op.h | 2 +-
linux-user/qemu.h | 2 +-
target/alpha/cpu-param.h | 3 +-
target/arm/cpu-param.h | 8 +-
target/arm/cpu.h | 8 +-
target/arm/internals.h | 1 +
target/arm/tcg/sve_ldst_internal.h | 2 +-
target/avr/cpu-param.h | 2 +-
target/hexagon/cpu-param.h | 2 +
target/hppa/cpu-param.h | 8 +-
target/hppa/cpu.h | 2 -
target/i386/cpu-param.h | 3 +-
target/i386/cpu.h | 5 --
target/i386/tcg/seg_helper.h | 10 +--
target/i386/tcg/tcg-cpu.h | 2 +
target/loongarch/cpu-param.h | 2 +-
target/m68k/cpu-param.h | 2 +
target/m68k/cpu.h | 2 -
target/microblaze/cpu-param.h | 3 +-
target/microblaze/cpu.h | 2 -
target/mips/cpu-param.h | 2 +-
target/mips/cpu.h | 2 -
target/openrisc/cpu-param.h | 2 +-
target/openrisc/cpu.h | 2 -
target/ppc/cpu-param.h | 2 +-
target/riscv/cpu-param.h | 10 ++-
target/riscv/cpu.h | 6 --
target/rx/cpu-param.h | 2 +
target/s390x/cpu-param.h | 6 +-
target/s390x/cpu.h | 2 -
target/sh4/cpu-param.h | 2 +
target/sh4/cpu.h | 2 -
target/sparc/cpu-param.h | 23 +----
target/sparc/cpu.h | 1 -
target/tricore/cpu-param.h | 2 +
target/xtensa/cpu-param.h | 3 +-
accel/tcg/cpu-exec.c | 2 +
accel/tcg/cputlb.c | 23 ++---
accel/tcg/tcg-all.c | 84 +++++++++++--------
accel/tcg/translate-all.c | 6 +-
accel/tcg/translator.c | 4 +-
accel/tcg/user-exec.c | 23 ++---
semihosting/uaccess.c | 2 +-
target/alpha/cpu.c | 6 +-
target/alpha/mem_helper.c | 2 +-
target/arm/cpu.c | 17 ++--
target/arm/gdbstub64.c | 2 +-
target/arm/tcg/cpu-v7m.c | 5 ++
target/arm/tcg/helper-a64.c | 2 +-
target/arm/tcg/m_helper.c | 2 +-
target/arm/tcg/mte_helper.c | 2 +-
target/arm/tcg/mve_helper.c | 2 +-
target/arm/tcg/op_helper.c | 2 +-
target/arm/tcg/pauth_helper.c | 2 +-
target/arm/tcg/sme_helper.c | 2 +-
target/arm/tcg/sve_helper.c | 1 +
target/avr/cpu.c | 4 +-
target/avr/helper.c | 2 +-
target/hexagon/cpu.c | 3 +
target/hexagon/op_helper.c | 2 +-
target/hexagon/translate.c | 2 +-
target/hppa/cpu.c | 11 ++-
target/hppa/mem_helper.c | 2 +-
target/hppa/op_helper.c | 2 +-
target/i386/cpu.c | 34 --------
target/i386/tcg/access.c | 2 +-
target/i386/tcg/fpu_helper.c | 2 +-
target/i386/tcg/mem_helper.c | 2 +-
target/i386/tcg/mpx_helper.c | 2 +-
target/i386/tcg/seg_helper.c | 19 ++++-
target/i386/tcg/system/excp_helper.c | 2 +-
target/i386/tcg/system/misc_helper.c | 2 +-
target/i386/tcg/system/seg_helper.c | 2 +-
target/i386/tcg/system/svm_helper.c | 2 +-
target/i386/tcg/tcg-cpu.c | 23 +++++
target/i386/tcg/translate.c | 2 +-
target/i386/tcg/user/seg_helper.c | 2 +-
target/loongarch/cpu.c | 7 +-
target/loongarch/cpu_helper.c | 2 +-
target/loongarch/tcg/csr_helper.c | 2 +-
target/loongarch/tcg/fpu_helper.c | 2 +-
target/loongarch/tcg/iocsr_helper.c | 2 +-
target/loongarch/tcg/op_helper.c | 2 +-
target/loongarch/tcg/tlb_helper.c | 2 +-
target/m68k/cpu.c | 6 +-
target/m68k/fpu_helper.c | 2 +-
target/m68k/op_helper.c | 2 +-
target/microblaze/cpu.c | 8 +-
target/microblaze/helper.c | 2 +-
target/microblaze/mmu.c | 2 +-
target/microblaze/op_helper.c | 2 +-
target/microblaze/translate.c | 2 +-
target/mips/cpu.c | 5 +-
target/mips/tcg/ldst_helper.c | 2 +-
target/mips/tcg/msa_helper.c | 2 +-
target/mips/tcg/system/tlb_helper.c | 2 +-
target/openrisc/cpu.c | 5 +-
target/openrisc/translate.c | 2 +-
target/ppc/cpu_init.c | 5 +-
target/ppc/mem_helper.c | 2 +-
target/ppc/mmu_helper.c | 2 +-
target/ppc/tcg-excp_helper.c | 2 +-
target/riscv/cpu.c | 6 --
target/riscv/op_helper.c | 2 +-
target/riscv/tcg/tcg-cpu.c | 10 +++
target/riscv/vector_helper.c | 2 +-
target/riscv/zce_helper.c | 2 +-
target/rx/cpu.c | 8 +-
target/rx/helper.c | 2 +-
target/rx/op_helper.c | 2 +-
target/s390x/cpu.c | 9 +-
target/s390x/tcg/crypto_helper.c | 2 +-
target/s390x/tcg/int_helper.c | 2 +-
target/s390x/tcg/mem_helper.c | 2 +-
target/s390x/tcg/misc_helper.c | 2 +-
target/s390x/tcg/vec_helper.c | 2 +-
target/sh4/cpu.c | 6 +-
target/sh4/op_helper.c | 2 +-
target/sparc/cpu.c | 28 ++++++-
target/sparc/int32_helper.c | 2 +-
target/sparc/ldst_helper.c | 2 +-
target/sparc/mmu_helper.c | 2 +-
target/tricore/cpu.c | 5 +-
target/tricore/helper.c | 2 +-
target/tricore/op_helper.c | 2 +-
target/tricore/translate.c | 2 +-
target/xtensa/cpu.c | 6 +-
target/xtensa/mmu_helper.c | 2 +-
tcg/region.c | 4 +-
163 files changed, 472 insertions(+), 378 deletions(-)
create mode 100644 accel/tcg/backend-ldst.h
rename include/{exec => accel/tcg}/cpu-ldst-common.h (97%)
rename include/{exec/cpu_ldst.h => accel/tcg/cpu-ldst.h} (99%)
rename include/{exec => accel/tcg}/cpu-mmu-index.h (78%)Signature · 1 line
2.47.1
PATCH v2 38/43 tcg: Move cpu_req_mo() macro to target-agnostic 'backend-ldst.h'
--- accel/tcg/backend-ldst.h | 41 +++++++++++++++++++++++++++++++++++++ accel/tcg/internal-common.h | 27 ++++++++++++++++++++++++ accel/tcg/internal-target.h | 28 ------------------------- accel/tcg/cputlb.c | 1 + accel/tcg/user-exec.c | 1 + 5 files changed, 70 insertions(+), 28 deletions(-) create mode 100644 accel/tcg/backend-ldst.h
accel/tcg/backend-ldst.h new file +41 -0
@@ -0,0 +1,41 @@ +/* +* Internal memory barrier helpers for QEMU (target agnostic) +* +* Copyright (c) 2003 Fabrice Bellard +* +* SPDX-License-Identifier: LGPL-2.1-or-later +*/ + +#ifndef ACCEL_TCG_BACKEND_LDST_H +#define ACCEL_TCG_BACKEND_LDST_H + +#include "tcg-target-mo.h" + +/** +* tcg_req_mo: +* @guest_mo: Guest default memory order +* @type: TCGBar +* +* Filter @type to the barrier that is required for the guest +* memory ordering vs the host memory ordering. A non-zero +* result indicates that some barrier is required. +*/ +#define tcg_req_mo (guest_mo, type) \ + ((type) & guest_mo & ~TCG_TARGET_DEFAULT_MO) + +/** +* cpu_req_mo: +* @cpu: CPUState +* @type: TCGBar +* +* If tcg_req_mo indicates a barrier for @type is required +* for the guest memory model, issue a host memory barrier. +*/ +#define cpu_req_mo (cpu, type) \ + do { \ + if (tcg_req_mo(cpu->cc->tcg_ops->guest_default_memory_order, type)) { \ + smp_mb(); \ + } \ + } while (0) + +#endif
accel/tcg/internal-common.h +27 -0
@@ -108,4 +108,31 @@ static inline tb_page_addr_t get_page_addr_code(CPUArchState *env, return get_page_addr_code_hostp(env, addr, NULL); } +/** +* tcg_req_mo: +* @guest_mo: Guest default memory order +* @type: TCGBar +* +* Filter @type to the barrier that is required for the guest +* memory ordering vs the host memory ordering. A non-zero +* result indicates that some barrier is required. +*/ +#define tcg_req_mo (guest_mo, type) \ + ((type) & guest_mo & ~TCG_TARGET_DEFAULT_MO) + +/** +* cpu_req_mo: +* @cpu: CPUState +* @type: TCGBar +* +* If tcg_req_mo indicates a barrier for @type is required +* for the guest memory model, issue a host memory barrier. +*/ +#define cpu_req_mo (cpu, type) \ + do { \ + if (tcg_req_mo(cpu->cc->tcg_ops->guest_default_memory_order, type)) { \ + smp_mb(); \ + } \ + } while (0) +#endif
accel/tcg/internal-target.h +0 -28
@@ -13,7 +13,6 @@#include "exec/exec-all.h" #include "exec/translation-block.h" #include "tb-internal.h" -#include "tcg-target-mo.h" #include "exec/mmap-lock.h" /*
@@ -44,31 +43,4 @@ void page_table_config_init(void); G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);#endif /* CONFIG_USER_ONLY */ -/** -* tcg_req_mo: -* @guest_mo: Guest default memory order -* @type: TCGBar -* -* Filter @type to the barrier that is required for the guest -* memory ordering vs the host memory ordering. A non-zero -* result indicates that some barrier is required. -*/ -#define tcg_req_mo (guest_mo, type) \ - ((type) & guest_mo & ~TCG_TARGET_DEFAULT_MO) - -/** -* cpu_req_mo: -* @cpu: CPUState -* @type: TCGBar -* -* If tcg_req_mo indicates a barrier for @type is required -* for the guest memory model, issue a host memory barrier. -*/ -#define cpu_req_mo (cpu, type) \ - do { \ - if (tcg_req_mo(cpu->cc->tcg_ops->guest_default_memory_order, type)) { \ - smp_mb(); \ - } \ - } while (0) -#endif /* ACCEL_TCG_INTERNAL_H */
accel/tcg/cputlb.c +1 -0
@@ -48,6 +48,7 @@#include "qemu/plugin-memory.h" #endif #include "tcg/tcg-ldst.h" +#include "backend-ldst.h" /* DEBUG defines, enable DEBUG_TLB_LOG to log to the CPU_LOG_MMU target */
accel/tcg/user-exec.c +1 -0
@@ -37,6 +37,7 @@#include "qemu/int128.h" #include "trace.h" #include "tcg/tcg-ldst.h" +#include "backend-ldst.h" #include "internal-common.h" #include "internal-target.h" #include "tb-internal.h"
Signature · 1 line
2.47.1
Re: [PATCH-for-10.1 v2 38/43] tcg: Move cpu_req_mo() macro to target-agnostic 'backend-ldst.h'
Quoted 83 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- accel/tcg/backend-ldst.h | 41 +++++++++++++++++++++++++++++++++++++ accel/tcg/internal-common.h | 27 ++++++++++++++++++++++++ accel/tcg/internal-target.h | 28 ------------------------- accel/tcg/cputlb.c | 1 + accel/tcg/user-exec.c | 1 + 5 files changed, 70 insertions(+), 28 deletions(-)create mode 100644
accel/tcg/backend-ldst.haccel/tcg/backend-ldst.h new file +41
-0@@ -0,0 +1,41 @@ +/* +* Internal memory barrier helpers for QEMU (target agnostic) +* +* Copyright (c) 2003 Fabrice Bellard +* +* SPDX-License-Identifier: LGPL-2.1-or-later +*/ + +#ifndef ACCEL_TCG_BACKEND_LDST_H +#define ACCEL_TCG_BACKEND_LDST_H + +#include "tcg-target-mo.h" + +/** +* tcg_req_mo: +* @guest_mo: Guest default memory order +* @type: TCGBar +* +* Filter @type to the barrier that is required for the guest +* memory ordering vs the host memory ordering. A non-zero +* result indicates that some barrier is required. +*/ +#define tcg_req_mo (guest_mo, type) \ + ((type) & guest_mo & ~TCG_TARGET_DEFAULT_MO) + +/** +* cpu_req_mo: +* @cpu: CPUState +* @type: TCGBar +* +* If tcg_req_mo indicates a barrier for @type is required +* for the guest memory model, issue a host memory barrier. +*/ +#define cpu_req_mo (cpu, type) \ + do { \ + if (tcg_req_mo(cpu->cc->tcg_ops->guest_default_memory_order, type)) { \ + smp_mb(); \ + } \ + } while (0) + +#endif accel/tcg/internal-common.h +18
-0@@ -108,4 +108,31 @@ static inline tb_page_addr_t get_page_addr_code(CPUArchState *env,return get_page_addr_code_hostp (env, addr,NULL ); } +/** +* tcg_req_mo: +* @guest_mo: Guest default memory order +* @type: TCGBar +* +* Filter @type to the barrier that is required for the guest +* memory ordering vs the host memory ordering. A non-zero +* result indicates that some barrier is required. +*/ +#define tcg_req_mo (guest_mo, type) \ + ((type) & guest_mo & ~TCG_TARGET_DEFAULT_MO) + +/** +* cpu_req_mo: +* @cpu: CPUState +* @type: TCGBar +* +* If tcg_req_mo indicates a barrier for @type is required
accel/tcg/internal-common.h static inline tb_page_addr_t get_page_addr_code(CPUArchState *env, · line 138
Quoted 10 lines
accel/tcg/internal-common.h +9
-0+* for the guest memory model, issue a host memory barrier. +*/ +#define cpu_req_mo (cpu, type) \ + do { \ + if (tcg_req_mo(cpu->cc->tcg_ops->guest_default_memory_order, type)) { \ + smp_mb(); \ + } \ + } while (0) +#endif
I assume you meant to remove this from here in v2.
r~
Quoted 68 lines
accel/tcg/internal-target.h +0
-28@@ -13,7 +13,6 @@#include "exec/exec-all.h" #include "exec/translation-block.h" #include "tb-internal.h" -#include "tcg-target-mo.h" #include "exec/mmap-lock.h" /* @@ -44,31 +43,4 @@ void page_table_config_init(void); G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);#endif /* CONFIG_USER_ONLY */ -/** -* tcg_req_mo: -* @guest_mo: Guest default memory order -* @type: TCGBar -* -* Filter @type to the barrier that is required for the guest -* memory ordering vs the host memory ordering. A non-zero -* result indicates that some barrier is required. -*/ -#define tcg_req_mo (guest_mo, type) \ - ((type) & guest_mo & ~TCG_TARGET_DEFAULT_MO) - -/** -* cpu_req_mo: -* @cpu: CPUState -* @type: TCGBar -* -* If tcg_req_mo indicates a barrier for @type is required -* for the guest memory model, issue a host memory barrier. -*/ -#define cpu_req_mo (cpu, type) \ - do { \ - if (tcg_req_mo(cpu->cc->tcg_ops->guest_default_memory_order, type)) { \ - smp_mb(); \ - } \ - } while (0) -#endif /* ACCEL_TCG_INTERNAL_H */ accel/tcg/cputlb.c +1
-0@@ -48,6 +48,7 @@#include "qemu/plugin-memory.h" #endif #include "tcg/tcg-ldst.h" +#include "backend-ldst.h" /* DEBUG defines, enable DEBUG_TLB_LOG to log to the CPU_LOG_MMU target */ accel/tcg/user-exec.c +1
-0@@ -37,6 +37,7 @@#include "qemu/int128.h" #include "trace.h" #include "tcg/tcg-ldst.h" +#include "backend-ldst.h" #include "internal-common.h" #include "internal-target.h" #include "tb-internal.h"
PATCH v2 39/43 tcg: Move qemu_tcg_mttcg_enabled() to 'system/tcg.h'
In reply to Philippe Mathieu-Daudéqemu_tcg_mttcg_enabled() is specific to 1/ TCG and 2/ system emulation. Move the prototype declaration to "system/tcg.h", reducing 'mttcg_enabled' variable scope.
--- include/hw/core/cpu.h | 9 --------- include/system/tcg.h | 8 ++++++++ accel/tcg/tcg-all.c | 16 ++++++++++++++-- target/riscv/tcg/tcg-cpu.c | 1 + tcg/region.c | 4 +++- 5 files changed, 26 insertions(+), 12 deletions(-)
include/hw/core/cpu.h +0 -9
@@ -594,15 +594,6 @@ extern CPUTailQ cpus_queue;extern __threadCPUState *current_cpu; -/** -* qemu_tcg_mttcg_enabled: -* Check whether we are running MultiThread TCG or not. -* -* Returns: %true if we are in MTTCG mode %false otherwise. -*/ -extern bool mttcg_enabled; -#define qemu_tcg_mttcg_enabled () (mttcg_enabled) -/** * cpu_paging_enabled: * @cpu: The CPU whose state is to be inspected.
include/system/tcg.h +8 -0
@@ -17,4 +17,12 @@ extern bool tcg_allowed;#define tcg_enabled () 0#endif +/** +* qemu_tcg_mttcg_enabled: +* Check whether we are running MultiThread TCG or not. +* +* Returns: %true if we are in MTTCG mode %false otherwise. +*/ +bool qemu_tcg_mttcg_enabled (void ); +#endif
accel/tcg/tcg-all.c +14 -2
@@ -38,6 +38,7 @@#include "hw/qdev-core.h" #else #include "hw/boards.h" +#include "system/tcg.h" #endif #include "internal-common.h" #include "cpu-param.h"
@@ -58,6 +59,17 @@ typedef struct TCGState TCGState;DECLARE_INSTANCE_CHECKER (TCGState,TCG_STATE , TYPE_TCG_ACCEL) +#ifndef CONFIG_USER_ONLY + +static bool mttcg_enabled; + +bool qemu_tcg_mttcg_enabled (void ) +{ +return mttcg_enabled; +} + +#endif /* !CONFIG_USER_ONLY */ +/* * We default to false if we know other options have been enabled * which are currently incompatible with MTTCG. Otherwise when each
@@ -97,7 +109,6 @@ static void tcg_accel_instance_init(Object *obj)#endif } -bool mttcg_enabled;bool one_insn_per_tb;static int tcg_init_machine (MachineState *ms)
@@ -107,10 +118,11 @@ static int tcg_init_machine(MachineState *ms)unsigned max_cpus =1 ;#else unsigned max_cpus = ms->smp.max_cpus; + + mttcg_enabled = s->mttcg_enabled;#endif tcg_allowed = true; - mttcg_enabled = s->mttcg_enabled;page_init ();tb_htable_init ();
target/riscv/tcg/tcg-cpu.c +1 -0
@@ -36,6 +36,7 @@#include "tcg/tcg.h" #ifndef CONFIG_USER_ONLY #include "hw/boards.h" +#include "system/tcg.h" #endif /* Hash that stores user set extensions */
tcg/region.c +3 -1
@@ -34,7 +34,9 @@#include "exec/translation-block.h" #include "tcg-internal.h" #include "host/cpuinfo.h" - +#ifndef CONFIG_USER_ONLY +#include "system/tcg.h" +#endif /* * Local source-level compatibility with Unix.
Signature · 1 line
2.47.1
Re: [PATCH-for-10.1 v2 39/43] tcg: Move qemu_tcg_mttcg_enabled() to 'system/tcg.h'
Quoted 7 lines · Philippe Mathieu-Daudé
qemu_tcg_mttcg_enabled()is specific to 1/ TCG and 2/ system emulation. Move the prototype declaration to "system/tcg.h", reducing 'mttcg_enabled' variable scope.Signed-off-by Philippe Mathieu-Daudé<[email protected]>Reviewed-by Pierrick Bouvier<[email protected]>
Quoted 7 lines
--- include/hw/core/cpu.h | 9 --------- include/system/tcg.h | 8 ++++++++ accel/tcg/tcg-all.c | 16 ++++++++++++++-- target/riscv/tcg/tcg-cpu.c | 1 + tcg/region.c | 4 +++- 5 files changed, 26 insertions(+), 12 deletions(-)
r~
PATCH v2 40/43 tcg: Convert TCGState::mttcg_enabled to TriState
In reply to Philippe Mathieu-DaudéUse the OnOffAuto type as 3-state.
Since the TCGState instance is zero-initialized, the mttcg_enabled is initialzed as AUTO (ON_OFF_AUTO_AUTO).
In tcg_init_machine(), if mttcg_enabled is still AUTO, set a default value (effectively inlining the default_mttcg_enabled() method content).
In the tcg_get_thread() getter, consider AUTO / OFF states as "single", otherwise ON is "multi".
--- accel/tcg/tcg-all.c | 60 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 31 deletions(-)
accel/tcg/tcg-all.c +29 -31
@@ -32,6 +32,7 @@#include "qemu/error-report.h" #include "qemu/accel.h" #include "qemu/atomic.h" +#include "qapi/qapi-types-common.h" #include "qapi/qapi-builtin-visit.h" #include "qemu/units.h" #if defined(CONFIG_USER_ONLY )
@@ -47,7 +48,7 @@struct TCGState {AccelState parent_obj; -bool mttcg_enabled; +OnOffAuto mttcg_enabled;bool one_insn_per_tb;int splitwx_enabled;unsigned long tb_size;
@@ -70,37 +71,10 @@ bool qemu_tcg_mttcg_enabled(void)#endif /* !CONFIG_USER_ONLY */ -/* -* We default to false if we know other options have been enabled -* which are currently incompatible with MTTCG. Otherwise when each -* guest (target) has been updated to support: -* - atomic instructions -* - memory ordering primitives (barriers) -* they can set the appropriate CONFIG flags in ${target}-softmmu.mak -* -* Once a guest architecture has been converted to the new primitives -* there is one remaining limitation to check: -* - The guest can't be oversized (e.g. 64 bit guest on 32 bit host) -*/ - -static bool default_mttcg_enabled (void ) -{ -if (icount_enabled ()) { -return false; - } -#ifdef TARGET_SUPPORTS_MTTCG -return true; -#else -return false; -#endif -} -static void tcg_accel_instance_init (Object *obj) {TCGState *s =TCG_STATE (obj); - s->mttcg_enabled =default_mttcg_enabled (); -/* If debugging enabled, default "auto on", otherwise off. */ #if defined(CONFIG_DEBUG_TCG ) && !defined(CONFIG_USER_ONLY ) s->splitwx_enabled =-1 ;
@@ -118,7 +92,31 @@ static int tcg_init_machine(MachineState *ms)unsigned max_cpus =1 ;#else unsigned max_cpus = ms->smp.max_cpus; +#ifdef TARGET_SUPPORTS_MTTCG +bool mttcg_supported = true; +#else +bool mttcg_supported = false; +#endif +if (s->mttcg_enabled ==ON_OFF_AUTO_AUTO ) { +/* +* We default to false if we know other options have been enabled +* which are currently incompatible with MTTCG. Otherwise when each +* guest (target) has been updated to support: +* - atomic instructions +* - memory ordering primitives (barriers) +* they can set the appropriate CONFIG flags in ${target}-softmmu.mak +* +* Once a guest architecture has been converted to the new primitives +* there is one remaining limitation to check: +* - The guest can't be oversized (e.g. 64 bit guest on 32 bit host) +*/ +if (icount_enabled ()) { + s->mttcg_enabled =ON_OFF_AUTO_OFF ; + }else { + s->mttcg_enabled = mttcg_supported; + } + } mttcg_enabled = s->mttcg_enabled;#endif
@@ -147,7 +145,7 @@ static char *tcg_get_thread(Object *obj, Error **errp) {TCGState *s =TCG_STATE (obj); -return g_strdup (s->mttcg_enabled ?"multi" :"single" ); +return g_strdup (s->mttcg_enabled ==ON_OFF_AUTO_ON ?"multi" :"single" ); }static void tcg_set_thread (Object *obj,const char *value,Error **errp)
@@ -162,10 +160,10 @@ static void tcg_set_thread(Object *obj, const char *value, Error **errp)warn_report ("Guest not yet converted to MTTCG - " "you may get unexpected results" );#endif - s->mttcg_enabled = true; + s->mttcg_enabled =ON_OFF_AUTO_ON ; } }else if (strcmp (value,"single" ) ==0 ) { - s->mttcg_enabled = false; + s->mttcg_enabled =ON_OFF_AUTO_OFF ; }else {error_setg (errp,"Invalid 'thread' setting %s" , value); }
Signature · 1 line
2.47.1
PATCH v2 41/43 tcg: Factor mttcg_init() out
In reply to Philippe Mathieu-DaudéKeep MTTCG initialization code out of tcg_init_machine().
--- accel/tcg/tcg-all.c | 50 +++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 22 deletions(-)
accel/tcg/tcg-all.c +28 -22
@@ -69,29 +69,8 @@ bool qemu_tcg_mttcg_enabled(void)return mttcg_enabled; } -#endif /* !CONFIG_USER_ONLY */ - -static void tcg_accel_instance_init (Object *obj) +static void mttcg_init (TCGState *s) { -TCGState *s =TCG_STATE (obj); - -/* If debugging enabled, default "auto on", otherwise off. */ -#if defined(CONFIG_DEBUG_TCG ) && !defined(CONFIG_USER_ONLY ) - s->splitwx_enabled =-1 ; -#else - s->splitwx_enabled =0 ; -#endif -} - -bool one_insn_per_tb; - -static int tcg_init_machine (MachineState *ms) -{ -TCGState *s =TCG_STATE (current_accel ()); -#ifdef CONFIG_USER_ONLY -unsigned max_cpus =1 ; -#else -unsigned max_cpus = ms->smp.max_cpus;#ifdef TARGET_SUPPORTS_MTTCG bool mttcg_supported = true;#else
@@ -118,6 +97,33 @@ static int tcg_init_machine(MachineState *ms) } } mttcg_enabled = s->mttcg_enabled; +} + +#endif /* !CONFIG_USER_ONLY */ + +static void tcg_accel_instance_init (Object *obj) +{ +TCGState *s =TCG_STATE (obj); + +/* If debugging enabled, default "auto on", otherwise off. */ +#if defined(CONFIG_DEBUG_TCG ) && !defined(CONFIG_USER_ONLY ) + s->splitwx_enabled =-1 ; +#else + s->splitwx_enabled =0 ; +#endif +} + +bool one_insn_per_tb; + +static int tcg_init_machine (MachineState *ms) +{ +TCGState *s =TCG_STATE (current_accel ()); +#ifdef CONFIG_USER_ONLY +unsigned max_cpus =1 ; +#else +unsigned max_cpus = ms->smp.max_cpus; + +mttcg_init (s);#endif tcg_allowed = true;
Signature · 1 line
2.47.1
Re: [PATCH-for-10.1 v2 41/43] tcg: Factor mttcg_init() out
Quoted 6 lines · Philippe Mathieu-Daudé
Keep MTTCG initialization code out of
tcg_init_machine().Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- accel/tcg/tcg-all.c | 50 +++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 22 deletions(-)
r~
PATCH v2 42/43 tcg: Convert TARGET_SUPPORTS_MTTCG to TCGCPUOps::mttcg_supported field
In reply to Philippe Mathieu-DaudéInstead of having a compile-time TARGET_SUPPORTS_MTTCG definition, have each target set the 'mttcg_supported' field in the TCGCPUOps structure.
Since so far we only emulate one target architecture at a time, tcg_init_machine() gets whether MTTCG is supported via the current CPU class (CPU_RESOLVING_TYPE).
Since TARGET_SUPPORTS_MTTCG isn't available anymore, instead of emiting a warning when the 'thread' property is set in tcg_set_thread(), emit it in tcg_init_machine() where it is consumed.
--- docs/devel/multi-thread-tcg.rst | 2 +- configs/targets/aarch64-softmmu.mak | 1 - configs/targets/alpha-softmmu.mak | 1 - configs/targets/arm-softmmu.mak | 1 - configs/targets/hppa-softmmu.mak | 1 - configs/targets/i386-softmmu.mak | 1 - configs/targets/loongarch64-softmmu.mak | 1 - configs/targets/microblaze-softmmu.mak | 1 - configs/targets/microblazeel-softmmu.mak | 1 - configs/targets/mips-softmmu.mak | 1 - configs/targets/mipsel-softmmu.mak | 1 - configs/targets/or1k-softmmu.mak | 1 - configs/targets/ppc64-softmmu.mak | 1 - configs/targets/riscv32-softmmu.mak | 1 - configs/targets/riscv64-softmmu.mak | 1 - configs/targets/s390x-softmmu.mak | 1 - configs/targets/sparc-softmmu.mak | 1 - configs/targets/sparc64-softmmu.mak | 1 - configs/targets/x86_64-softmmu.mak | 1 - configs/targets/xtensa-softmmu.mak | 1 - configs/targets/xtensaeb-softmmu.mak | 1 - include/accel/tcg/cpu-ops.h | 8 ++++++++ include/exec/poison.h | 1 - accel/tcg/tcg-all.c | 17 ++++++++--------- target/alpha/cpu.c | 1 + target/arm/cpu.c | 1 + target/arm/tcg/cpu-v7m.c | 1 + target/avr/cpu.c | 1 + target/hexagon/cpu.c | 1 + target/hppa/cpu.c | 1 + target/i386/tcg/tcg-cpu.c | 1 + target/loongarch/cpu.c | 1 + target/m68k/cpu.c | 1 + target/microblaze/cpu.c | 1 + target/mips/cpu.c | 1 + target/openrisc/cpu.c | 1 + target/ppc/cpu_init.c | 1 + target/riscv/tcg/tcg-cpu.c | 1 + target/rx/cpu.c | 1 + target/s390x/cpu.c | 1 + target/sh4/cpu.c | 1 + target/sparc/cpu.c | 1 + target/tricore/cpu.c | 1 + target/xtensa/cpu.c | 1 + 44 files changed, 37 insertions(+), 31 deletions(-)
docs/devel/multi-thread-tcg.rst +1 -1
@@ -30,7 +30,7 @@ user-space thread. This is enabled by default for all FE/BE combinations where the host memory model is able to accommodate the guest (TCGCPUOps::guest_default_memory_order & ~TCG_TARGET_DEFAULT_MO is zero) and the guest has had the required work done to support this safely -(TARGET_SUPPORTS_MTTCG). +(TCGCPUOps::mttcg_supported). System emulation will fall back to the original round robin approach if:
configs/targets/aarch64-softmmu.mak +0 -1
@@ -1,6 +1,5 @@ TARGET_ARCH=aarch64 TARGET_BASE_ARCH=arm -TARGET_SUPPORTS_MTTCG=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml gdb-xml/aarch64-pauth.xml # needed by boot.c
configs/targets/alpha-softmmu.mak +0 -1
@@ -1,3 +1,2 @@ TARGET_ARCH=alpha -TARGET_SUPPORTS_MTTCG=y TARGET_LONG_BITS=64
configs/targets/arm-softmmu.mak +0 -1
@@ -1,5 +1,4 @@ TARGET_ARCH=arm -TARGET_SUPPORTS_MTTCG=y TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml # needed by boot.c TARGET_NEED_FDT=y
configs/targets/hppa-softmmu.mak +0 -1
@@ -1,4 +1,3 @@ TARGET_ARCH=hppa TARGET_BIG_ENDIAN=y -TARGET_SUPPORTS_MTTCG=y TARGET_LONG_BITS=64
configs/targets/i386-softmmu.mak +0 -1
@@ -1,5 +1,4 @@ TARGET_ARCH=i386 -TARGET_SUPPORTS_MTTCG=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_KVM_HAVE_RESET_PARKED_VCPU=y TARGET_XML_FILES= gdb-xml/i386-32bit.xml
configs/targets/loongarch64-softmmu.mak +0 -1
@@ -1,7 +1,6 @@ TARGET_ARCH=loongarch64 TARGET_BASE_ARCH=loongarch TARGET_KVM_HAVE_GUEST_DEBUG=y -TARGET_SUPPORTS_MTTCG=y TARGET_XML_FILES= gdb-xml/loongarch-base32.xml gdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml gdb-xml/loongarch-lsx.xml gdb-xml/loongarch-lasx.xml # all boards require libfdt TARGET_NEED_FDT=y
configs/targets/microblaze-softmmu.mak +0 -1
@@ -1,6 +1,5 @@ TARGET_ARCH=microblaze TARGET_BIG_ENDIAN=y -TARGET_SUPPORTS_MTTCG=y # needed by boot.c TARGET_NEED_FDT=y TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
configs/targets/microblazeel-softmmu.mak +0 -1
@@ -1,5 +1,4 @@ TARGET_ARCH=microblaze -TARGET_SUPPORTS_MTTCG=y # needed by boot.c TARGET_NEED_FDT=y TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml
configs/targets/mips-softmmu.mak +0 -1
@@ -1,4 +1,3 @@ TARGET_ARCH=mips TARGET_BIG_ENDIAN=y -TARGET_SUPPORTS_MTTCG=y TARGET_LONG_BITS=32
configs/targets/mipsel-softmmu.mak +0 -1
@@ -1,3 +1,2 @@ TARGET_ARCH=mips -TARGET_SUPPORTS_MTTCG=y TARGET_LONG_BITS=32
configs/targets/or1k-softmmu.mak +0 -1
@@ -1,5 +1,4 @@ TARGET_ARCH=openrisc -TARGET_SUPPORTS_MTTCG=y TARGET_BIG_ENDIAN=y # needed by boot.c and all boards TARGET_NEED_FDT=y
configs/targets/ppc64-softmmu.mak +0 -1
@@ -1,7 +1,6 @@ TARGET_ARCH=ppc64 TARGET_BASE_ARCH=ppc TARGET_BIG_ENDIAN=y -TARGET_SUPPORTS_MTTCG=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml # all boards require libfdt
configs/targets/riscv32-softmmu.mak +0 -1
@@ -1,6 +1,5 @@ TARGET_ARCH=riscv32 TARGET_BASE_ARCH=riscv -TARGET_SUPPORTS_MTTCG=y TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml # needed by boot.c TARGET_NEED_FDT=y
configs/targets/riscv64-softmmu.mak +0 -1
@@ -1,6 +1,5 @@ TARGET_ARCH=riscv64 TARGET_BASE_ARCH=riscv -TARGET_SUPPORTS_MTTCG=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-virtual.xml # needed by boot.c
configs/targets/s390x-softmmu.mak +0 -1
@@ -1,6 +1,5 @@ TARGET_ARCH=s390x TARGET_BIG_ENDIAN=y -TARGET_SUPPORTS_MTTCG=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-virt-kvm.xml gdb-xml/s390-gs.xml TARGET_LONG_BITS=64
configs/targets/sparc-softmmu.mak +0 -1
@@ -1,4 +1,3 @@ TARGET_ARCH=sparc TARGET_BIG_ENDIAN=y -TARGET_SUPPORTS_MTTCG=y TARGET_LONG_BITS=32
configs/targets/sparc64-softmmu.mak +0 -1
@@ -1,5 +1,4 @@ TARGET_ARCH=sparc64 TARGET_BASE_ARCH=sparc TARGET_BIG_ENDIAN=y -TARGET_SUPPORTS_MTTCG=y TARGET_LONG_BITS=64
configs/targets/x86_64-softmmu.mak +0 -1
@@ -1,6 +1,5 @@ TARGET_ARCH=x86_64 TARGET_BASE_ARCH=i386 -TARGET_SUPPORTS_MTTCG=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_KVM_HAVE_RESET_PARKED_VCPU=y TARGET_XML_FILES= gdb-xml/i386-64bit.xml
configs/targets/xtensa-softmmu.mak +0 -1
@@ -1,3 +1,2 @@ TARGET_ARCH=xtensa -TARGET_SUPPORTS_MTTCG=y TARGET_LONG_BITS=32
configs/targets/xtensaeb-softmmu.mak +0 -1
@@ -1,4 +1,3 @@ TARGET_ARCH=xtensa TARGET_BIG_ENDIAN=y -TARGET_SUPPORTS_MTTCG=y TARGET_LONG_BITS=32
include/accel/tcg/cpu-ops.h +8 -0
@@ -19,6 +19,14 @@#include "tcg/tcg-mo.h" struct TCGCPUOps { +/** +* mttcg_supported: multi-threaded TCG is supported +* +* Target (TCG frontend) supports: +* - atomic instructions +* - memory ordering primitives (barriers) +*/ +bool mttcg_supported;/** * @guest_default_memory_order: default barrier that is required
include/exec/poison.h +0 -1
@@ -35,7 +35,6 @@#pragma GCC poison TARGET_HAS_BFLT#pragma GCC poison TARGET_NAME -#pragma GCC poison TARGET_SUPPORTS_MTTCG#pragma GCC poison TARGET_BIG_ENDIAN#pragma GCC poison TCG_GUEST_DEFAULT_MO#pragma GCC poison TARGET_HAS_PRECISE_SMC
accel/tcg/tcg-all.c +8 -9
@@ -41,8 +41,10 @@#include "hw/boards.h" #include "system/tcg.h" #endif +#include "accel/tcg/cpu-ops.h" #include "internal-common.h" #include "cpu-param.h" +#include "cpu.h" struct TCGState {
@@ -71,11 +73,8 @@ bool qemu_tcg_mttcg_enabled(void)static void mttcg_init (TCGState *s) { -#ifdef TARGET_SUPPORTS_MTTCG -bool mttcg_supported = true; -#else -bool mttcg_supported = false; -#endif +CPUClass *cc =CPU_CLASS (object_class_by_name (CPU_RESOLVING_TYPE )); +bool mttcg_supported = cc->tcg_ops->mttcg_supported;if (s->mttcg_enabled ==ON_OFF_AUTO_AUTO ) {/*
@@ -96,6 +95,10 @@ static void mttcg_init(TCGState *s) s->mttcg_enabled = mttcg_supported; } } +if (s->mttcg_enabled ==ON_OFF_AUTO_ON && !mttcg_supported) { +warn_report ("Guest not yet converted to MTTCG - " +"you may get unexpected results" ); + } mttcg_enabled = s->mttcg_enabled; }
@@ -162,10 +165,6 @@ static void tcg_set_thread(Object *obj, const char *value, Error **errp)if (icount_enabled ()) {error_setg (errp,"No MTTCG when icount is enabled" ); }else { -#ifndef TARGET_SUPPORTS_MTTCG -warn_report ("Guest not yet converted to MTTCG - " -"you may get unexpected results" ); -#endif s->mttcg_enabled =ON_OFF_AUTO_ON ; } }else if (strcmp (value,"single" ) ==0 ) {
target/alpha/cpu.c +1 -0
@@ -235,6 +235,7 @@ static const struct SysemuCPUOps alpha_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps alpha_tcg_ops = { + .mttcg_supported = true,/* Alpha processors have a weak memory model */ .guest_default_memory_order =0 ,
target/arm/cpu.c +1 -0
@@ -2671,6 +2671,7 @@ static const struct SysemuCPUOps arm_sysemu_ops = {#ifdef CONFIG_TCG static const TCGCPUOps arm_tcg_ops = { + .mttcg_supported = true,/* ARM processors have a weak memory model */ .guest_default_memory_order = 0,
target/arm/tcg/cpu-v7m.c +1 -0
@@ -232,6 +232,7 @@ static void cortex_m55_initfn(Object *obj) }static const TCGCPUOps arm_v7m_tcg_ops = { + .mttcg_supported = true,/* ARM processors have a weak memory model */ .guest_default_memory_order =0 ,
target/avr/cpu.c +1 -0
@@ -224,6 +224,7 @@ static const struct SysemuCPUOps avr_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps avr_tcg_ops = { + .mttcg_supported = false, .guest_default_memory_order =0 , .initialize = avr_cpu_tcg_init, .translate_code = avr_cpu_translate_code,
target/hexagon/cpu.c +1 -0
@@ -320,6 +320,7 @@ static void hexagon_cpu_init(Object *obj)#include "accel/tcg/cpu-ops.h" static const TCGCPUOps hexagon_tcg_ops = { + .mttcg_supported = false,/* MTTCG not yet supported: require strict ordering */ .guest_default_memory_order =TCG_MO_ALL , .initialize = hexagon_translate_init,
target/hppa/cpu.c +1 -0
@@ -253,6 +253,7 @@ static const struct SysemuCPUOps hppa_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps hppa_tcg_ops = { + .mttcg_supported = true,/* PA-RISC 1.x processors have a strong memory model. */ /* * ??? While we do not yet implement PA-RISC 2.0, those processors have
target/i386/tcg/tcg-cpu.c +1 -0
@@ -125,6 +125,7 @@ static bool x86_debug_check_breakpoint(CPUState *cs)#include "accel/tcg/cpu-ops.h" static const TCGCPUOps x86_tcg_ops = { + .mttcg_supported = true,/* * The x86 has a strong memory model with some store-after-load re-ordering */
target/loongarch/cpu.c +1 -0
@@ -864,6 +864,7 @@ static void loongarch_cpu_dump_state(CPUState *cs, FILE *f, int flags)#include "accel/tcg/cpu-ops.h" static const TCGCPUOps loongarch_tcg_ops = { + .mttcg_supported = true, .guest_default_memory_order =0 , .initialize = loongarch_translate_init,
target/m68k/cpu.c +1 -0
@@ -589,6 +589,7 @@ static const struct SysemuCPUOps m68k_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps m68k_tcg_ops = { + .mttcg_supported = false,/* MTTCG not yet supported: require strict ordering */ .guest_default_memory_order =TCG_MO_ALL ,
target/microblaze/cpu.c +1 -0
@@ -427,6 +427,7 @@ static const struct SysemuCPUOps mb_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps mb_tcg_ops = { + .mttcg_supported = true,/* MicroBlaze is always in-order. */ .guest_default_memory_order =TCG_MO_ALL ,
target/mips/cpu.c +1 -0
@@ -550,6 +550,7 @@ static const Property mips_cpu_properties[] = {#ifdef CONFIG_TCG #include "accel/tcg/cpu-ops.h" static const TCGCPUOps mips_tcg_ops = { + .mttcg_supported =TARGET_LONG_BITS ==32 , .guest_default_memory_order =0 , .initialize = mips_tcg_init,
target/openrisc/cpu.c +1 -0
@@ -243,6 +243,7 @@ static const struct SysemuCPUOps openrisc_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps openrisc_tcg_ops = { + .mttcg_supported = true, .guest_default_memory_order =0 , .initialize = openrisc_translate_init,
target/ppc/cpu_init.c +1 -0
@@ -7483,6 +7483,7 @@ static const TCGCPUOps ppc_tcg_ops = { .restore_state_to_opc = ppc_restore_state_to_opc, .mmu_index = ppc_cpu_mmu_index, + .mttcg_supported = TARGET_LONG_BITS == 64, .guest_default_memory_order = 0,#ifdef CONFIG_USER_ONLY
target/riscv/tcg/tcg-cpu.c +1 -0
@@ -141,6 +141,7 @@ static void riscv_restore_state_to_opc(CPUState *cs, }static const TCGCPUOps riscv_tcg_ops = { + .mttcg_supported = true, .guest_default_memory_order =0 , .initialize = riscv_translate_init,
target/rx/cpu.c +1 -0
@@ -204,6 +204,7 @@ static const struct SysemuCPUOps rx_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps rx_tcg_ops = { + .mttcg_supported = false,/* MTTCG not yet supported: require strict ordering */ .guest_default_memory_order =TCG_MO_ALL ,
target/s390x/cpu.c +1 -0
@@ -345,6 +345,7 @@ void cpu_get_tb_cpu_state(CPUS390XState *env, vaddr *pc, }static const TCGCPUOps s390_tcg_ops = { + .mttcg_supported = true,/* * The z/Architecture has a strong memory model with some * store-after-load re-ordering.
target/sh4/cpu.c +1 -0
@@ -262,6 +262,7 @@ static const struct SysemuCPUOps sh4_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps superh_tcg_ops = { + .mttcg_supported = false,/* MTTCG not yet supported: require strict ordering */ .guest_default_memory_order =TCG_MO_ALL ,
target/sparc/cpu.c +1 -0
@@ -1001,6 +1001,7 @@ static const struct SysemuCPUOps sparc_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps sparc_tcg_ops = { + .mttcg_supported = true,/* * From Oracle SPARC Architecture 2015: *
target/tricore/cpu.c +1 -0
@@ -172,6 +172,7 @@ static const struct SysemuCPUOps tricore_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps tricore_tcg_ops = { + .mttcg_supported = false,/* MTTCG not yet supported: require strict ordering */ .guest_default_memory_order =TCG_MO_ALL , .initialize = tricore_tcg_init,
target/xtensa/cpu.c +1 -0
@@ -232,6 +232,7 @@ static const struct SysemuCPUOps xtensa_sysemu_ops = {#include "accel/tcg/cpu-ops.h" static const TCGCPUOps xtensa_tcg_ops = { + .mttcg_supported = true,/* Xtensa processors have a weak memory model */ .guest_default_memory_order =0 ,
Signature · 1 line
2.47.1
Re: [PATCH-for-10.1 v2 42/43] tcg: Convert TARGET_SUPPORTS_MTTCG to TCGCPUOps::mttcg_supported field
Quoted 13 lines · Philippe Mathieu-Daudé
Instead of having a compile-time
TARGET_SUPPORTS_MTTCGdefinition, have each target set the 'mttcg_supported' field in the TCGCPUOps structure.Since so far we only emulate one target architecture at a time,
tcg_init_machine()gets whether MTTCG is supported via the current CPU class (CPU_RESOLVING_TYPE).Since
TARGET_SUPPORTS_MTTCGisn't available anymore, instead of emiting a warning when the 'thread' property is set intcg_set_thread(), emit it intcg_init_machine()where it is consumed.
Quoted 4 lines
Signed-off-by Philippe Mathieu-Daudé<[email protected]>Reviewed-by Anton Johansson<[email protected]>Reviewed-by Pierrick Bouvier<[email protected]>---
r~
PATCH v2 43/43 target/arm: Update comment around cpu_untagged_addr()
In reply to Philippe Mathieu-DaudéSince commit f9ba56a03c2 ("user: Introduce 'user/guest-host.h' header") cpu_untagged_addr() is only needed in "user/guest-host.h".
--- target/arm/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/arm/cpu.h +1 -1
@@ -3233,7 +3233,7 @@ extern const uint64_t pred_esz_masks[5];* linux syscall TIF_TAGGED_ADDR setting, not TBI in general. * * There should be a better place to put this, but we need this in -* include/exec/cpu_ldst.h, and not some place linux-user specific. +* include/user/guest-host.h, and not some place linux-user specific. */ static inline target_ulong cpu_untagged_addr (CPUState *cs,target_ulong x) {
Signature · 1 line
2.47.1
Re: [PATCH-for-10.1 v2 43/43] target/arm: Update comment around cpu_untagged_addr()
Quoted 7 lines · Philippe Mathieu-Daudé
Since commit
f9ba56a03c2("user: Introduce 'user/guest-host.h' header")cpu_untagged_addr()is only needed in "user/guest-host.h".Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/arm/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
r~