From nobody Thu May 2 03:13:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1555405152; cv=none; d=zoho.com; s=zohoarc; b=e8g1bDZz0axdjKcPWEjUIdqjvLiw4vpFcG4xpd/gJBb2eRxvzfyjl3v8OOhF6JUmomu2RhgS3+sQ+OPAXnNcBsqTLyeoh3MG3CAwr3aanj25BswIgtoce7QuzMj4zzclMK/GUBgX40EXYBzdBgOlpUc5hv9Sg3CBfRxhjegOK0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555405152; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=b95/3I8DuP0ZT6lnNT0jXE98AMKVKgXDKzs8U2ghBqQ=; b=FMvc4NfqhLtI75EaeCSFytxRs6Sp8zq6krERcfnMF7mDyJDYQBeIOUKMC/ygyp0clZOzS3nsmSwlDyaEsbwHrdZiyB2gQ9TQyBqEIVbBO+LADGk76WvgP9MlhFvhqiKXtZpOeBO2pmisgdWyASNJfpjNKWDLgkjDBj9brl9buTU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555405152714345.7316064069928; Tue, 16 Apr 2019 01:59:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:33046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGJYs-0004wG-N5 for importer@patchew.org; Tue, 16 Apr 2019 04:35:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGJVY-0002t0-Gk for qemu-devel@nongnu.org; Tue, 16 Apr 2019 04:32:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGJVV-0006NA-S5 for qemu-devel@nongnu.org; Tue, 16 Apr 2019 04:32:00 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:44958) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGJVV-0006H8-AJ for qemu-devel@nongnu.org; Tue, 16 Apr 2019 04:31:57 -0400 Received: by mail-pg1-x543.google.com with SMTP id i2so9963175pgj.11 for ; Tue, 16 Apr 2019 01:31:57 -0700 (PDT) Received: from localhost.localdomain (rrcs-66-91-136-155.west.biz.rr.com. [66.91.136.155]) by smtp.gmail.com with ESMTPSA id m23sm76992727pfa.117.2019.04.16.01.31.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 01:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=b95/3I8DuP0ZT6lnNT0jXE98AMKVKgXDKzs8U2ghBqQ=; b=KQFu8lbnIpZqruyOCdTMVu+/QHJuPqiTwg8JRBkZajOVjLq2dn9vaAa7GihUiSKbWf 1GUaGpVmBGqR1vAMT3IXFb2DOblFe3FRi+PAC9wP6ATCK+KyMuEwkQu54nBhQE+WSOyQ S33txF2rMY13TsZ7W84+Km5fqHxfsF087UZkx9zMeNSET71XSx+i9gfVQ1yFrVzY5ahg 9KzXxO2d45du+x43vtYnTl3E1l4soyXYDlMWk2GoK8W2nYQIueMBLVlw9FnXYpZUv+ar vDHqLi9E6eccM/M5moppLXxFSP89TYDqj0yZUnSSbXTlgY2/eOQenXaM/1Z+Av8nav7r icQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=b95/3I8DuP0ZT6lnNT0jXE98AMKVKgXDKzs8U2ghBqQ=; b=A8Es0meq9YqbgM5bbxNphUkGxLoBpOYnFrulvUPMZvbxUWqowHdkUHQsEREXJZoSfp 8pj0P+qbW5oSS3+SIcyVZY4dA6RJHCJiP2M0ZQrU6dAyI62o0ojPjQvSFtQ9OaFrym+2 LxihDatFWjMoYElg7XQ7rJnciLrrbogkEPc5ud3runGrWXqioFbmOBx2fJdeiDaLBbRC xGzMh7lX4HH0dJ4TBj4f7M9Oe81WSqFGuzpF++0nqcZqdtkWw8nHkaG41j/WJ7/St3sp mwN9aDt9qMxJwjuT+joaTMXaKouzWYEzgvOCNxY47PpPdt4TOt6/3ZN9ndlUIKRXoWHi WCcg== X-Gm-Message-State: APjAAAV2++e006+gqqgrsIjyg52z1Y5gmU85bb5JkIh4mMRoCvx49w7z VT20rRJkp5fIMkK0cnjdz6OpaHC3JyY= X-Google-Smtp-Source: APXvYqwb4uFhEBvL0N7naD9hinp7Q3zQwJVeND6S0yDhONwiVRkncad6iGDJzkHPvJFjDJojC6ds5w== X-Received: by 2002:a63:170d:: with SMTP id x13mr75894341pgl.169.1555403515553; Tue, 16 Apr 2019 01:31:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 15 Apr 2019 22:31:49 -1000 Message-Id: <20190416083150.19649-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190416083150.19649-1-richard.henderson@linaro.org> References: <20190416083150.19649-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH 1/2] tcg: Hoist max_insns computation to tb_gen_code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In order to handle TB's that translate to too much code, we need to place the control of the length of the translation in the hands of the code gen master loop. Signed-off-by: Richard Henderson Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/exec-all.h | 4 ++-- include/exec/translator.h | 3 ++- accel/tcg/translate-all.c | 15 +++++++++++++-- accel/tcg/translator.c | 15 ++------------- target/alpha/translate.c | 4 ++-- target/arm/translate.c | 4 ++-- target/cris/translate.c | 10 +--------- target/hppa/translate.c | 5 ++--- target/i386/translate.c | 4 ++-- target/lm32/translate.c | 10 +--------- target/m68k/translate.c | 4 ++-- target/microblaze/translate.c | 10 +--------- target/mips/translate.c | 4 ++-- target/moxie/translate.c | 11 ++--------- target/nios2/translate.c | 14 ++------------ target/openrisc/translate.c | 4 ++-- target/ppc/translate.c | 4 ++-- target/riscv/translate.c | 4 ++-- target/s390x/translate.c | 4 ++-- target/sh4/translate.c | 4 ++-- target/sparc/translate.c | 4 ++-- target/tilegx/translate.c | 12 +----------- target/tricore/translate.c | 16 ++-------------- target/unicore32/translate.c | 10 +--------- target/xtensa/translate.c | 4 ++-- 25 files changed, 56 insertions(+), 127 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 97b90cb0db..58e988b3b1 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -40,8 +40,8 @@ typedef ram_addr_t tb_page_addr_t; =20 #include "qemu/log.h" =20 -void gen_intermediate_code(CPUState *cpu, struct TranslationBlock *tb); -void restore_state_to_opc(CPUArchState *env, struct TranslationBlock *tb, +void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in= sns); +void restore_state_to_opc(CPUArchState *env, TranslationBlock *tb, target_ulong *data); =20 void cpu_gen_init(void); diff --git a/include/exec/translator.h b/include/exec/translator.h index 71e7b2c347..66dfe906c4 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -123,6 +123,7 @@ typedef struct TranslatorOps { * @db: Disassembly context. * @cpu: Target vCPU. * @tb: Translation block. + * @max_insns: Maximum number of insns to translate. * * Generic translator loop. * @@ -137,7 +138,7 @@ typedef struct TranslatorOps { * - When too many instructions have been translated. */ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, - CPUState *cpu, TranslationBlock *tb); + CPUState *cpu, TranslationBlock *tb, int max_insns); =20 void translator_loop_temp_check(DisasContextBase *db); =20 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 8f593b926f..fcdfe6c0ec 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1673,7 +1673,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tb_page_addr_t phys_pc, phys_page2; target_ulong virt_page2; tcg_insn_unit *gen_code_buf; - int gen_code_size, search_size; + int gen_code_size, search_size, max_insns; #ifdef CONFIG_PROFILER TCGProfile *prof =3D &tcg_ctx->prof; int64_t ti; @@ -1691,6 +1691,17 @@ TranslationBlock *tb_gen_code(CPUState *cpu, cflags &=3D ~CF_CLUSTER_MASK; cflags |=3D cpu->cluster_index << CF_CLUSTER_SHIFT; =20 + max_insns =3D cflags & CF_COUNT_MASK; + if (max_insns =3D=3D 0) { + max_insns =3D CF_COUNT_MASK; + } + if (max_insns > TCG_MAX_INSNS) { + max_insns =3D TCG_MAX_INSNS; + } + if (cpu->singlestep_enabled || singlestep) { + max_insns =3D 1; + } + buffer_overflow: tb =3D tb_alloc(pc); if (unlikely(!tb)) { @@ -1720,7 +1731,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tcg_func_start(tcg_ctx); =20 tcg_ctx->cpu =3D ENV_GET_CPU(env); - gen_intermediate_code(cpu, tb); + gen_intermediate_code(cpu, tb, max_insns); tcg_ctx->cpu =3D NULL; =20 trace_translate_block(tb, tb->pc, tb->tc.ptr); diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index afd0a49ea6..8d65ead708 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -32,7 +32,7 @@ void translator_loop_temp_check(DisasContextBase *db) } =20 void translator_loop(const TranslatorOps *ops, DisasContextBase *db, - CPUState *cpu, TranslationBlock *tb) + CPUState *cpu, TranslationBlock *tb, int max_insns) { int bp_insn =3D 0; =20 @@ -42,20 +42,9 @@ void translator_loop(const TranslatorOps *ops, DisasCont= extBase *db, db->pc_next =3D db->pc_first; db->is_jmp =3D DISAS_NEXT; db->num_insns =3D 0; + db->max_insns =3D max_insns; db->singlestep_enabled =3D cpu->singlestep_enabled; =20 - /* Instruction counting */ - db->max_insns =3D tb_cflags(db->tb) & CF_COUNT_MASK; - if (db->max_insns =3D=3D 0) { - db->max_insns =3D CF_COUNT_MASK; - } - if (db->max_insns > TCG_MAX_INSNS) { - db->max_insns =3D TCG_MAX_INSNS; - } - if (db->singlestep_enabled || singlestep) { - db->max_insns =3D 1; - } - ops->init_disas_context(db, cpu); tcg_debug_assert(db->is_jmp =3D=3D DISAS_NEXT); /* no early exit */ =20 diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 9d8f9b3eea..2c9cccf6c1 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -3049,10 +3049,10 @@ static const TranslatorOps alpha_tr_ops =3D { .disas_log =3D alpha_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in= sns) { DisasContext dc; - translator_loop(&alpha_tr_ops, &dc.base, cpu, tb); + translator_loop(&alpha_tr_ops, &dc.base, cpu, tb, max_insns); } =20 void restore_state_to_opc(CPUAlphaState *env, TranslationBlock *tb, diff --git a/target/arm/translate.c b/target/arm/translate.c index d408e4d7ef..b6b65ca360 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -13755,7 +13755,7 @@ static const TranslatorOps thumb_translator_ops =3D= { }; =20 /* generate intermediate code for basic block 'tb'. */ -void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in= sns) { DisasContext dc; const TranslatorOps *ops =3D &arm_translator_ops; @@ -13769,7 +13769,7 @@ void gen_intermediate_code(CPUState *cpu, Translati= onBlock *tb) } #endif =20 - translator_loop(ops, &dc.base, cpu, tb); + translator_loop(ops, &dc.base, cpu, tb, max_insns); } =20 void arm_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprint= f, diff --git a/target/cris/translate.c b/target/cris/translate.c index 11b2c11174..777810452d 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -3080,7 +3080,7 @@ static unsigned int crisv32_decoder(CPUCRISState *env= , DisasContext *dc) */ =20 /* generate intermediate code for basic block 'tb'. */ -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { CPUCRISState *env =3D cs->env_ptr; uint32_t pc_start; @@ -3090,7 +3090,6 @@ void gen_intermediate_code(CPUState *cs, struct Trans= lationBlock *tb) uint32_t page_start; target_ulong npc; int num_insns; - int max_insns; =20 if (env->pregs[PR_VR] =3D=3D 32) { dc->decoder =3D crisv32_decoder; @@ -3136,13 +3135,6 @@ void gen_intermediate_code(CPUState *cs, struct Tran= slationBlock *tb) =20 page_start =3D pc_start & TARGET_PAGE_MASK; num_insns =3D 0; - max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; - if (max_insns =3D=3D 0) { - max_insns =3D CF_COUNT_MASK; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns =3D TCG_MAX_INSNS; - } =20 gen_tb_start(tb); do { diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 43b74367ea..7c03c62768 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -4312,11 +4312,10 @@ static const TranslatorOps hppa_tr_ops =3D { .disas_log =3D hppa_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) - +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { DisasContext ctx; - translator_loop(&hppa_tr_ops, &ctx.base, cs, tb); + translator_loop(&hppa_tr_ops, &ctx.base, cs, tb, max_insns); } =20 void restore_state_to_opc(CPUHPPAState *env, TranslationBlock *tb, diff --git a/target/i386/translate.c b/target/i386/translate.c index b725bec37c..77d6b73e42 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -8590,11 +8590,11 @@ static const TranslatorOps i386_tr_ops =3D { }; =20 /* generate intermediate code for basic block 'tb'. */ -void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in= sns) { DisasContext dc; =20 - translator_loop(&i386_tr_ops, &dc.base, cpu, tb); + translator_loop(&i386_tr_ops, &dc.base, cpu, tb, max_insns); } =20 void restore_state_to_opc(CPUX86State *env, TranslationBlock *tb, diff --git a/target/lm32/translate.c b/target/lm32/translate.c index b32feb7564..ac5169c4e7 100644 --- a/target/lm32/translate.c +++ b/target/lm32/translate.c @@ -1049,7 +1049,7 @@ static inline void decode(DisasContext *dc, uint32_t = ir) } =20 /* generate intermediate code for basic block 'tb'. */ -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { CPULM32State *env =3D cs->env_ptr; LM32CPU *cpu =3D lm32_env_get_cpu(env); @@ -1057,7 +1057,6 @@ void gen_intermediate_code(CPUState *cs, struct Trans= lationBlock *tb) uint32_t pc_start; uint32_t page_start; int num_insns; - int max_insns; =20 pc_start =3D tb->pc; dc->features =3D cpu->features; @@ -1077,13 +1076,6 @@ void gen_intermediate_code(CPUState *cs, struct Tran= slationBlock *tb) =20 page_start =3D pc_start & TARGET_PAGE_MASK; num_insns =3D 0; - max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; - if (max_insns =3D=3D 0) { - max_insns =3D CF_COUNT_MASK; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns =3D TCG_MAX_INSNS; - } =20 gen_tb_start(tb); do { diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 6217a683f1..838ff64875 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -6169,10 +6169,10 @@ static const TranslatorOps m68k_tr_ops =3D { .disas_log =3D m68k_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in= sns) { DisasContext dc; - translator_loop(&m68k_tr_ops, &dc.base, cpu, tb); + translator_loop(&m68k_tr_ops, &dc.base, cpu, tb, max_insns); } =20 static double floatx80_to_double(CPUM68KState *env, uint16_t high, uint64_= t low) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 78ca265b04..efdea5b635 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1600,7 +1600,7 @@ static inline void decode(DisasContext *dc, uint32_t = ir) } =20 /* generate intermediate code for basic block 'tb'. */ -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { CPUMBState *env =3D cs->env_ptr; MicroBlazeCPU *cpu =3D mb_env_get_cpu(env); @@ -1610,7 +1610,6 @@ void gen_intermediate_code(CPUState *cs, struct Trans= lationBlock *tb) uint32_t page_start, org_flags; uint32_t npc; int num_insns; - int max_insns; =20 pc_start =3D tb->pc; dc->cpu =3D cpu; @@ -1634,13 +1633,6 @@ void gen_intermediate_code(CPUState *cs, struct Tran= slationBlock *tb) =20 page_start =3D pc_start & TARGET_PAGE_MASK; num_insns =3D 0; - max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; - if (max_insns =3D=3D 0) { - max_insns =3D CF_COUNT_MASK; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns =3D TCG_MAX_INSNS; - } =20 gen_tb_start(tb); do diff --git a/target/mips/translate.c b/target/mips/translate.c index 364bd6dc4f..ee630e1c5d 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -29720,11 +29720,11 @@ static const TranslatorOps mips_tr_ops =3D { .disas_log =3D mips_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { DisasContext ctx; =20 - translator_loop(&mips_tr_ops, &ctx.base, cs, tb); + translator_loop(&mips_tr_ops, &ctx.base, cs, tb, max_insns); } =20 static void fpu_dump_state(CPUMIPSState *env, FILE *f, fprintf_function fp= u_fprintf, diff --git a/target/moxie/translate.c b/target/moxie/translate.c index 68ca223e22..d6eebf527f 100644 --- a/target/moxie/translate.c +++ b/target/moxie/translate.c @@ -813,13 +813,13 @@ static int decode_opc(MoxieCPU *cpu, DisasContext *ct= x) } =20 /* generate intermediate code for basic block 'tb'. */ -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { CPUMoxieState *env =3D cs->env_ptr; MoxieCPU *cpu =3D moxie_env_get_cpu(env); DisasContext ctx; target_ulong pc_start; - int num_insns, max_insns; + int num_insns; =20 pc_start =3D tb->pc; ctx.pc =3D pc_start; @@ -829,13 +829,6 @@ void gen_intermediate_code(CPUState *cs, struct Transl= ationBlock *tb) ctx.singlestep_enabled =3D 0; ctx.bstate =3D BS_NONE; num_insns =3D 0; - max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; - if (max_insns =3D=3D 0) { - max_insns =3D CF_COUNT_MASK; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns =3D TCG_MAX_INSNS; - } =20 gen_tb_start(tb); do { diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 7fa03ed05a..a402e572df 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -805,12 +805,11 @@ static void gen_exception(DisasContext *dc, uint32_t = excp) } =20 /* generate intermediate code for basic block 'tb'. */ -void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { CPUNios2State *env =3D cs->env_ptr; DisasContext dc1, *dc =3D &dc1; int num_insns; - int max_insns; =20 /* Initialize DC */ dc->cpu_env =3D cpu_env; @@ -823,20 +822,11 @@ void gen_intermediate_code(CPUState *cs, TranslationB= lock *tb) =20 /* Set up instruction counts */ num_insns =3D 0; - if (cs->singlestep_enabled || singlestep) { - max_insns =3D 1; - } else { + if (max_insns > 1) { int page_insns =3D (TARGET_PAGE_SIZE - (tb->pc & TARGET_PAGE_MASK)= ) / 4; - max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; - if (max_insns =3D=3D 0) { - max_insns =3D CF_COUNT_MASK; - } if (max_insns > page_insns) { max_insns =3D page_insns; } - if (max_insns > TCG_MAX_INSNS) { - max_insns =3D TCG_MAX_INSNS; - } } =20 gen_tb_start(tb); diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 89680f882d..92a2b99f9a 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1408,11 +1408,11 @@ static const TranslatorOps openrisc_tr_ops =3D { .disas_log =3D openrisc_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { DisasContext ctx; =20 - translator_loop(&openrisc_tr_ops, &ctx.base, cs, tb); + translator_loop(&openrisc_tr_ops, &ctx.base, cs, tb, max_insns); } =20 void openrisc_cpu_dump_state(CPUState *cs, FILE *f, diff --git a/target/ppc/translate.c b/target/ppc/translate.c index badc1ae1a3..d625687910 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -7864,11 +7864,11 @@ static const TranslatorOps ppc_tr_ops =3D { .disas_log =3D ppc_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { DisasContext ctx; =20 - translator_loop(&ppc_tr_ops, &ctx.base, cs, tb); + translator_loop(&ppc_tr_ops, &ctx.base, cs, tb, max_insns); } =20 void restore_state_to_opc(CPUPPCState *env, TranslationBlock *tb, diff --git a/target/riscv/translate.c b/target/riscv/translate.c index dd763647ea..967eac7bc3 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -783,11 +783,11 @@ static const TranslatorOps riscv_tr_ops =3D { .disas_log =3D riscv_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { DisasContext ctx; =20 - translator_loop(&riscv_tr_ops, &ctx.base, cs, tb); + translator_loop(&riscv_tr_ops, &ctx.base, cs, tb, max_insns); } =20 void riscv_translate_init(void) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 0afa8f7ca5..d4951836ad 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -6552,11 +6552,11 @@ static const TranslatorOps s390x_tr_ops =3D { .disas_log =3D s390x_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { DisasContext dc; =20 - translator_loop(&s390x_tr_ops, &dc.base, cs, tb); + translator_loop(&s390x_tr_ops, &dc.base, cs, tb, max_insns); } =20 void restore_state_to_opc(CPUS390XState *env, TranslationBlock *tb, diff --git a/target/sh4/translate.c b/target/sh4/translate.c index ab254b0e8d..34d3438250 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -2382,11 +2382,11 @@ static const TranslatorOps sh4_tr_ops =3D { .disas_log =3D sh4_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { DisasContext ctx; =20 - translator_loop(&sh4_tr_ops, &ctx.base, cs, tb); + translator_loop(&sh4_tr_ops, &ctx.base, cs, tb, max_insns); } =20 void restore_state_to_opc(CPUSH4State *env, TranslationBlock *tb, diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 74315cdf09..091bab53af 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -5962,11 +5962,11 @@ static const TranslatorOps sparc_tr_ops =3D { .disas_log =3D sparc_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { DisasContext dc =3D {}; =20 - translator_loop(&sparc_tr_ops, &dc.base, cs, tb); + translator_loop(&sparc_tr_ops, &dc.base, cs, tb, max_insns); } =20 void sparc_tcg_init(void) diff --git a/target/tilegx/translate.c b/target/tilegx/translate.c index df1e4d0fef..c46a4ab151 100644 --- a/target/tilegx/translate.c +++ b/target/tilegx/translate.c @@ -2369,7 +2369,7 @@ static void translate_one_bundle(DisasContext *dc, ui= nt64_t bundle) } } =20 -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { CPUTLGState *env =3D cs->env_ptr; DisasContext ctx; @@ -2377,7 +2377,6 @@ void gen_intermediate_code(CPUState *cs, struct Trans= lationBlock *tb) uint64_t pc_start =3D tb->pc; uint64_t page_start =3D pc_start & TARGET_PAGE_MASK; int num_insns =3D 0; - int max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; =20 dc->pc =3D pc_start; dc->mmuidx =3D 0; @@ -2392,15 +2391,6 @@ void gen_intermediate_code(CPUState *cs, struct Tran= slationBlock *tb) qemu_log_lock(); qemu_log("IN: %s\n", lookup_symbol(pc_start)); } - if (!max_insns) { - max_insns =3D CF_COUNT_MASK; - } - if (cs->singlestep_enabled || singlestep) { - max_insns =3D 1; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns =3D TCG_MAX_INSNS; - } gen_tb_start(tb); =20 while (1) { diff --git a/target/tricore/translate.c b/target/tricore/translate.c index b12c391be5..30d3ff77f5 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -8807,24 +8807,12 @@ static void decode_opc(CPUTriCoreState *env, DisasC= ontext *ctx, int *is_branch) } } =20 -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { CPUTriCoreState *env =3D cs->env_ptr; DisasContext ctx; target_ulong pc_start; - int num_insns, max_insns; - - num_insns =3D 0; - max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; - if (max_insns =3D=3D 0) { - max_insns =3D CF_COUNT_MASK; - } - if (singlestep) { - max_insns =3D 1; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns =3D TCG_MAX_INSNS; - } + int num_insns =3D 0; =20 pc_start =3D tb->pc; ctx.pc =3D pc_start; diff --git a/target/unicore32/translate.c b/target/unicore32/translate.c index 002569ff3b..8547164e47 100644 --- a/target/unicore32/translate.c +++ b/target/unicore32/translate.c @@ -1870,14 +1870,13 @@ static void disas_uc32_insn(CPUUniCore32State *env,= DisasContext *s) } =20 /* generate intermediate code for basic block 'tb'. */ -void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_ins= ns) { CPUUniCore32State *env =3D cs->env_ptr; DisasContext dc1, *dc =3D &dc1; target_ulong pc_start; uint32_t page_start; int num_insns; - int max_insns; =20 /* generate intermediate code */ num_temps =3D 0; @@ -1896,13 +1895,6 @@ void gen_intermediate_code(CPUState *cs, Translation= Block *tb) cpu_F1d =3D tcg_temp_new_i64(); page_start =3D pc_start & TARGET_PAGE_MASK; num_insns =3D 0; - max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; - if (max_insns =3D=3D 0) { - max_insns =3D CF_COUNT_MASK; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns =3D TCG_MAX_INSNS; - } =20 #ifndef CONFIG_USER_ONLY if ((env->uncached_asr & ASR_M) =3D=3D ASR_MODE_USER) { diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 65561d2c49..435955dab0 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -1634,10 +1634,10 @@ static const TranslatorOps xtensa_translator_ops = =3D { .disas_log =3D xtensa_tr_disas_log, }; =20 -void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in= sns) { DisasContext dc =3D {}; - translator_loop(&xtensa_translator_ops, &dc.base, cpu, tb); + translator_loop(&xtensa_translator_ops, &dc.base, cpu, tb, max_insns); } =20 void xtensa_cpu_dump_state(CPUState *cs, FILE *f, --=20 2.17.1 From nobody Thu May 2 03:13:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1555405186; cv=none; d=zoho.com; s=zohoarc; b=SDdG9ZJ/5RvvJDI3wEIu9kda+4p3B77xEv/PjPFGMTgl07BzCSJpj5DG20v/mqGm8QIeAOR3/b1qgGCfvhsW16zHKDqBYBReenJT1THmu9R1WG13/VdPawPLf4GsYuaPkgPnTh1QYYHRXILpqaFzAspASTaNsEMwmVnfyKrRwYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555405186; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=OJTx2YMgBnLmxy9QSpmGl7JN/UE/jilvByUL/wxnNyQ=; b=ngeOBNIz8Z8QM6jOsYB7F69G1Bf0p0iSRRMpwIdEqHa5NgT/Wdk6t3E8kY69OTlR8tEnMccPM0+F/oZy75wEOpVmjaQzaCJqIxCgi+FHNqOFjgoey8cqGNUi6X12Vck/hgXY2piIYVrwcKHUywB3s0Shy6KN3Ig2yXa4zPoGD3A= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555405186243551.459164640255; Tue, 16 Apr 2019 01:59:46 -0700 (PDT) Received: from localhost ([127.0.0.1]:33008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGJX5-0003UO-N7 for importer@patchew.org; Tue, 16 Apr 2019 04:33:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGJVX-0002sd-UY for qemu-devel@nongnu.org; Tue, 16 Apr 2019 04:32:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGJVW-0006Oi-Lw for qemu-devel@nongnu.org; Tue, 16 Apr 2019 04:31:59 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:46578) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGJVW-0006Mj-Aw for qemu-devel@nongnu.org; Tue, 16 Apr 2019 04:31:58 -0400 Received: by mail-pl1-x642.google.com with SMTP id y6so9945366pll.13 for ; Tue, 16 Apr 2019 01:31:58 -0700 (PDT) Received: from localhost.localdomain (rrcs-66-91-136-155.west.biz.rr.com. [66.91.136.155]) by smtp.gmail.com with ESMTPSA id m23sm76992727pfa.117.2019.04.16.01.31.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 01:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OJTx2YMgBnLmxy9QSpmGl7JN/UE/jilvByUL/wxnNyQ=; b=EL8noG8gY3fvfVDXmkq8dC66MlvMNxPuTV0wvly49mejLzjDCMix8naBQUX59kQ1Iq 5vKm20rwEa6mCaVyGxfDDDjujgIBUMutTvcYlC05RCzFLRJxKNxakPpp/nTiGBUiaZBT mY3CDP2TKGwP9rWsyOv9CdOt9/O2haemjKnue/AoSrtO19JJF5eDd2csGvgRY6Sl/ky0 rGt82MbZwzqOLNQ51XWAaNb5kzWP/hR9gBlJ/+lNMh4+f6+dfPw2msaXwc85wKMT2MGA PDGnvzI5o0dfvvqvTUX4X++Nwup23YulJF+ohaDsrrH4B8a5KyrqjGRadsyfwr4j6hMh lfaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OJTx2YMgBnLmxy9QSpmGl7JN/UE/jilvByUL/wxnNyQ=; b=i1PXl8ui2swS1zKbpP5Fq+wxlF1DKVq4qZA8jXpESZuZ3dkKj9jEvbCt/8TT2zlMkQ fI2MoB934+DlvFmkh4Ki7YG5mG82kPNZoN9IRplNRxx+opSK6pYOFZkqD8bbCRbDAHec atwb/+F2b68MytxE6AbYDPHLu9p5SFdYiOPNqKpOlHVVF+Q4488dxWGOIu6EQ34emUac 7Ld32NSrifBfYoTUXa79orYABEUDP9fCJZ6SABkLnZTn3PVD5WA2hmVew2L9k16OR7fy bbhZtLqWMjiiBpTQEErqIjx9RZXQ+bvNQoaDp6jVZQeiVzWS/V0ooRnxYVg4T9IjjZDn iTww== X-Gm-Message-State: APjAAAW1mvgW4XZLAuj0/mYVsea8afOheNOmkjKy3ucb66G0DBve/1vf H2mJRmz4bPNgqLRxsOj+EXyC9pEMnx8= X-Google-Smtp-Source: APXvYqw40mP5GGDPKTfrmOMpg0B93wDji76qp0DcITBHf3ivbaO/Nr1+DKPvGvrwaK2NmI2zxWLmWg== X-Received: by 2002:a17:902:521:: with SMTP id 30mr50620388plf.248.1555403517037; Tue, 16 Apr 2019 01:31:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 15 Apr 2019 22:31:50 -1000 Message-Id: <20190416083150.19649-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190416083150.19649-1-richard.henderson@linaro.org> References: <20190416083150.19649-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 Subject: [Qemu-devel] [PATCH 2/2] tcg: Restart after TB code generation overflow X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If a TB generates too much code, try again with fewer insns. Fixes: https://bugs.launchpad.net/bugs/1824853 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- accel/tcg/translate-all.c | 39 +++++++++++++++++++++++++++++++++------ tcg/tcg.c | 4 ++++ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index fcdfe6c0ec..7086d5fd2a 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1721,6 +1721,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tb->cflags =3D cflags; tb->trace_vcpu_dstate =3D *cpu->trace_dstate; tcg_ctx->tb_cflags =3D cflags; + tb_overflow: =20 #ifdef CONFIG_PROFILER /* includes aborted translations because of exceptions */ @@ -1754,14 +1755,40 @@ TranslationBlock *tb_gen_code(CPUState *cpu, ti =3D profile_getclock(); #endif =20 - /* ??? Overflow could be handled better here. In particular, we - don't need to re-do gen_intermediate_code, nor should we re-do - the tcg optimization currently hidden inside tcg_gen_code. All - that should be required is to flush the TBs, allocate a new TB, - re-initialize it per above, and re-do the actual code generation. = */ gen_code_size =3D tcg_gen_code(tcg_ctx, tb); if (unlikely(gen_code_size < 0)) { - goto buffer_overflow; + switch (gen_code_size) { + case -1: + /* + * Overflow of code_gen_buffer, or the current slice of it. + * + * TODO: We don't need to re-do gen_intermediate_code, nor + * should we re-do the tcg optimization currently hidden + * inside tcg_gen_code. All that should be required is to + * flush the TBs, allocate a new TB, re-initialize it per + * above, and re-do the actual code generation. + */ + goto buffer_overflow; + + case -2: + /* + * The code generated for the TranslationBlock is too large. + * The maximum size allowed by the unwind info is 64k. + * There may be stricter constraints from relocations + * in the tcg backend. + * + * Try again with half as many insns as we attempted this time. + * If a single insn overflows, there's a bug somewhere... + */ + max_insns =3D tb->icount; +qemu_log("TB overflow: pc=3D%lx insns=3D%d\n", (unsigned long)pc, max_insn= s); + assert(max_insns > 1); + max_insns /=3D 2; + goto tb_overflow; + + default: + g_assert_not_reached(); + } } search_size =3D encode_search(tb, (void *)gen_code_buf + gen_code_size= ); if (unlikely(search_size < 0)) { diff --git a/tcg/tcg.c b/tcg/tcg.c index 9b2bf7f439..aa0e94521b 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3991,6 +3991,10 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) if (unlikely((void *)s->code_ptr > s->code_gen_highwater)) { return -1; } + /* Test for TB overflow, as seen by gen_insn_end_off. */ + if (unlikely(tcg_current_code_size(s) > UINT16_MAX)) { + return -2; + } } tcg_debug_assert(num_insns >=3D 0); s->gen_insn_end_off[num_insns] =3D tcg_current_code_size(s); --=20 2.17.1