V2 replaces the tcg const temp overflow patch.

r~

The following changes since commit 0e32462630687a18039464511bd0447ada5709c3:

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-request' into staging (2021-01-22 10:35:55 +0000)

https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20210124

for you to fetch changes up to ae30e86661b0f48562cd95918d37cbeec5d02262:

tcg: Restart code generation when we run out of temps (2021-01-24 08:03:27 -1000)

Fix tcg constant temp overflow.

Fix running during atomic single-step.

Partial support for apple silicon.

Cleanups for accel/tcg.

Douglas Crosher (1):

tcg: update the cpu running flag in cpu_exec_step_atomic

Philippe Mathieu-Daudé (4):

accel/tcg: Make cpu_gen_init() static

accel/tcg: Restrict tb_gen_code() from other accelerators

accel/tcg: Declare missing cpu_loop_exit*() stubs

accel/tcg: Restrict cpu_io_recompile() from other accelerators

Richard Henderson (4):

qemu/compiler: Split out qemu_build_not_reached_always

tcg: Optimize inline dup_const for MO_64

accel/tcg: Move tb_flush_jmp_cache() to cputlb.c

tcg: Restart code generation when we run out of temps

Roman Bolshakov (1):

tcg: Toggle page execution for Apple Silicon

Some large translation blocks can generate so many unique

constants that we run out of temps to hold them. In this

case, longjmp back to the start of code generation and

restart with a smaller translation block.

Buglink: https://bugs.launchpad.net/bugs/1912065

Tested-by: BALATON Zoltan <balaton@eik.bme.hu>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

include/tcg/tcg.h | 3 +++

accel/tcg/translate-all.c | 15 ++++++++++++++-

tcg/tcg.c | 11 ++++++++---

3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h

--- a/include/tcg/tcg.h

+++ b/include/tcg/tcg.h

@@ -XXX,XX +XXX,XX @@ struct TCGContext {

uint16_t gen_insn_end_off[TCG_MAX_INSNS];

target_ulong gen_insn_data[TCG_MAX_INSNS][TARGET_INSN_START_WORDS];

+ /* Exit to translator on overflow. */

+ sigjmp_buf jmp_trans;

};

static inline bool temp_readonly(TCGTemp *ts)

diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c

--- a/accel/tcg/translate-all.c

+++ b/accel/tcg/translate-all.c

@@ -XXX,XX +XXX,XX @@ TranslationBlock *tb_gen_code(CPUState *cpu,

ti = profile_getclock();

#endif

+ gen_code_size = sigsetjmp(tcg_ctx->jmp_trans, 0);

+ if (unlikely(gen_code_size != 0)) {

+ goto error_return;

+ }

+

tcg_func_start(tcg_ctx);

tcg_ctx->cpu = env_cpu(env);

gen_intermediate_code(cpu, tb, max_insns);

tcg_ctx->cpu = NULL;

+ max_insns = tb->icount;

trace_translate_block(tb, tb->pc, tb->tc.ptr);

@@ -XXX,XX +XXX,XX @@ TranslationBlock *tb_gen_code(CPUState *cpu,

gen_code_size = tcg_gen_code(tcg_ctx, tb);

if (unlikely(gen_code_size < 0)) {

+ error_return:

switch (gen_code_size) {

case -1:

/*

@@ -XXX,XX +XXX,XX @@ TranslationBlock *tb_gen_code(CPUState *cpu,

* flush the TBs, allocate a new TB, re-initialize it per

* above, and re-do the actual code generation.

*/

+ qemu_log_mask(CPU_LOG_TB_OP | CPU_LOG_TB_OP_OPT,

+ "Restarting code generation for "

+ "code_gen_buffer overflow\n");

goto buffer_overflow;

case -2:

@@ -XXX,XX +XXX,XX @@ TranslationBlock *tb_gen_code(CPUState *cpu,

* Try again with half as many insns as we attempted this time.

* If a single insn overflows, there's a bug somewhere...

*/

- max_insns = tb->icount;

assert(max_insns > 1);

max_insns /= 2;

+ qemu_log_mask(CPU_LOG_TB_OP | CPU_LOG_TB_OP_OPT,

+ "Restarting code generation with "

+ "smaller translation block (max %d insns)\n",

+ max_insns);

goto tb_overflow;

default:

diff --git a/tcg/tcg.c b/tcg/tcg.c

index XXXXXXX..XXXXXXX 100644

--- a/tcg/tcg.c

+++ b/tcg/tcg.c

@@ -XXX,XX +XXX,XX @@ void tcg_func_start(TCGContext *s)

QSIMPLEQ_INIT(&s->labels);

-static inline TCGTemp *tcg_temp_alloc(TCGContext *s)

+static TCGTemp *tcg_temp_alloc(TCGContext *s)

{

int n = s->nb_temps++;

- tcg_debug_assert(n < TCG_MAX_TEMPS);

+ if (n >= TCG_MAX_TEMPS) {

+ /* Signal overflow, starting over with fewer guest insns. */

+ siglongjmp(s->jmp_trans, -2);

+ }

return memset(&s->temps[n], 0, sizeof(TCGTemp));

}

-static inline TCGTemp *tcg_global_alloc(TCGContext *s)

+static TCGTemp *tcg_global_alloc(TCGContext *s)

{

TCGTemp *ts;

tcg_debug_assert(s->nb_globals == s->nb_temps);

+ tcg_debug_assert(s->nb_globals < TCG_MAX_TEMPS);

s->nb_globals++;

ts = tcg_temp_alloc(s);

ts->kind = TEMP_GLOBAL;

2.25.1