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

tcg: Introduce tcg_max_ctxs

Browse Source 
Finish the divorce of tcg/ from hw/, and do not take
the max cpu value from MachineState; just remember what
we were passed in tcg_init.

Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-03-09 23:06:32 -06:00
parent 43b972b7eb
commit 0e2d61cf29
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tcg/region.c
View File

@ -347,7 +347,7 @@ void tcg_region_initial_alloc(TCGContext *s)
/* Call from a safe-work context */ /* Call from a safe-work context */
void tcg_region_reset_all(void) void tcg_region_reset_all(void)
{ {
unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs);
unsigned int i; unsigned int i;
qemu_mutex_lock(&region.lock); qemu_mutex_lock(&region.lock);
@ -934,7 +934,7 @@ void tcg_region_prologue_set(TCGContext *s)
*/ */
size_t tcg_code_size(void) size_t tcg_code_size(void)
{ {
unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs);
unsigned int i; unsigned int i;
size_t total; size_t total;
@ -970,7 +970,7 @@ size_t tcg_code_capacity(void)
size_t tcg_tb_phys_invalidate_count(void) size_t tcg_tb_phys_invalidate_count(void)
{ {
unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs);
unsigned int i; unsigned int i;
size_t total = 0; size_t total = 0;

3
tcg/tcg-internal.h
View File

@ -28,7 +28,8 @@
#define TCG_HIGHWATER 1024 #define TCG_HIGHWATER 1024
extern TCGContext **tcg_ctxs; extern TCGContext **tcg_ctxs;
extern unsigned int n_tcg_ctxs; extern unsigned int tcg_cur_ctxs;
extern unsigned int tcg_max_ctxs;
void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus); void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus);
bool tcg_region_alloc(TCGContext *s); bool tcg_region_alloc(TCGContext *s);

23
tcg/tcg.c
View File

@ -43,11 +43,6 @@
#define NO_CPU_IO_DEFS #define NO_CPU_IO_DEFS
#include "exec/exec-all.h" #include "exec/exec-all.h"
#if !defined(CONFIG_USER_ONLY)
#include "hw/boards.h"
#endif
#include "tcg/tcg-op.h" #include "tcg/tcg-op.h"
#if UINTPTR_MAX == UINT32_MAX #if UINTPTR_MAX == UINT32_MAX
@ -155,7 +150,8 @@ static int tcg_out_ldst_finalize(TCGContext *s);
#endif #endif
TCGContext **tcg_ctxs; TCGContext **tcg_ctxs;
unsigned int n_tcg_ctxs; unsigned int tcg_cur_ctxs;
unsigned int tcg_max_ctxs;
TCGv_env cpu_env = 0; TCGv_env cpu_env = 0;
const void *tcg_code_gen_epilogue; const void *tcg_code_gen_epilogue;
uintptr_t tcg_splitwx_diff; uintptr_t tcg_splitwx_diff;
@ -475,7 +471,6 @@ void tcg_register_thread(void)
#else #else
void tcg_register_thread(void) void tcg_register_thread(void)
{ {
MachineState *ms = MACHINE(qdev_get_machine());
TCGContext *s = g_malloc(sizeof(*s)); TCGContext *s = g_malloc(sizeof(*s));
unsigned int i, n; unsigned int i, n;
@ -491,8 +486,8 @@ void tcg_register_thread(void)
} }
/* Claim an entry in tcg_ctxs */ /* Claim an entry in tcg_ctxs */
n = qatomic_fetch_inc(&n_tcg_ctxs); n = qatomic_fetch_inc(&tcg_cur_ctxs);
g_assert(n < ms->smp.max_cpus); g_assert(n < tcg_max_ctxs);
qatomic_set(&tcg_ctxs[n], s); qatomic_set(&tcg_ctxs[n], s);
if (n > 0) { if (n > 0) {
@ -643,9 +638,11 @@ static void tcg_context_init(unsigned max_cpus)
*/ */
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
tcg_ctxs = &tcg_ctx; tcg_ctxs = &tcg_ctx;
n_tcg_ctxs = 1; tcg_cur_ctxs = 1;
tcg_max_ctxs = 1;
#else #else
tcg_ctxs = g_new(TCGContext *, max_cpus); tcg_max_ctxs = max_cpus;
tcg_ctxs = g_new0(TCGContext *, max_cpus);
#endif #endif
tcg_debug_assert(!tcg_regset_test_reg(s->reserved_regs, TCG_AREG0)); tcg_debug_assert(!tcg_regset_test_reg(s->reserved_regs, TCG_AREG0));
@ -3937,7 +3934,7 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op)
static inline static inline
void tcg_profile_snapshot(TCGProfile *prof, bool counters, bool table) void tcg_profile_snapshot(TCGProfile *prof, bool counters, bool table)
{ {
unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs);
unsigned int i; unsigned int i;
for (i = 0; i < n_ctxs; i++) { for (i = 0; i < n_ctxs; i++) {
@ -4000,7 +3997,7 @@ void tcg_dump_op_count(void)
int64_t tcg_cpu_exec_time(void) int64_t tcg_cpu_exec_time(void)
{ {
unsigned int n_ctxs = qatomic_read(&n_tcg_ctxs); unsigned int n_ctxs = qatomic_read(&tcg_cur_ctxs);
unsigned int i; unsigned int i;
int64_t ret = 0; int64_t ret = 0;