From: David Gibson <david@gibson.dropbear.id.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org,
Richard Henderson <rth@twiddle.net>
Subject: Re: [Qemu-devel] [PATCH 5/5] ppc: Improve generation of conditional traps
Date: Tue, 9 Aug 2016 12:07:40 +1000 [thread overview]
Message-ID: <20160809020740.GC9057@voom.fritz.box> (raw)
In-Reply-To: <1469941993-27576-5-git-send-email-benh@kernel.crashing.org>
[-- Attachment #1: Type: text/plain, Size: 8510 bytes --]
On Sun, Jul 31, 2016 at 03:13:13PM +1000, Benjamin Herrenschmidt wrote:
> Translate most conditions to TCG conditions and avoid the helper
> for most of the common cases.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> target-ppc/translate.c | 168 ++++++++++++++++++++++++++++++++++++++-----------
> 1 file changed, 132 insertions(+), 36 deletions(-)
I've merged 1-4 of this series into ppc-for-2.8. I'm not really clear
whether a change is still needed on patch 5, so please resend either
way.
>
> diff --git a/target-ppc/translate.c b/target-ppc/translate.c
> index 47eb9ed..561976f 100644
> --- a/target-ppc/translate.c
> +++ b/target-ppc/translate.c
> @@ -3639,82 +3639,178 @@ static void gen_sc(DisasContext *ctx)
>
> /*** Trap ***/
>
> -/* Check for unconditional traps (always or never) */
> -static bool check_unconditional_trap(DisasContext *ctx)
> +static int TO2tcg[32] = {
> + TCG_COND_NEVER, /* no condition */
> + TCG_COND_GTU, /* 0x01 u> */
> + TCG_COND_LTU, /* 0x02 u< */
> + TCG_COND_NE, /* 0x03 u< or u> -> NE */
> + TCG_COND_EQ, /* 0x04 = */
> + TCG_COND_GEU, /* 0x05 u> or = */
> + TCG_COND_LEU, /* 0x06 u< or = */
> + TCG_COND_ALWAYS,/* 0x07 u< or u> or = -> ALWAYS */
> + TCG_COND_GT, /* 0x08 > */
> + -1, /* 0x09 > or u> -> weird */
> + -1, /* 0x0a > or u< -> weird */
> + -1, /* 0x0b > or u< or u> -> weird */
> + TCG_COND_GE, /* 0x0c > or = */
> + -1, /* 0x0d > or = or u> */
> + -1, /* 0x0e > or = or u< */
> + -1, /* 0x0f > or = or u> or u< */
> + TCG_COND_LT, /* 0x10 < */
> + -1, /* 0x11 < or u> -> weird */
> + -1, /* 0x12 < or u< -> weird */
> + -1, /* 0x13 < or u< or u> -> weird */
> + TCG_COND_LE, /* 0x14 < or = */
> + -1, /* 0x15 < or = or u> -> weird */
> + -1, /* 0x16 < or = or u< -> weird */
> + TCG_COND_ALWAYS,/* 0x17 < or = or u< or u> -> ALWAYS */
> + TCG_COND_NE, /* 0x18 < or > -> NE */
> + -1, /* 0x19 < or > or u> -> weird */
> + -1, /* 0x1a < or > or u< -> weird */
> + -1, /* 0x1b < or > or u> or u< -> weird */
> + TCG_COND_ALWAYS,/* 0x1c < or > or = -> ALWAYS */
> + TCG_COND_ALWAYS,/* 0x1d < or > or = or u> -> ALWAYS */
> + TCG_COND_ALWAYS,/* 0x1e < or > or = or u< -> ALWAYS */
> + TCG_COND_ALWAYS,/* 0x1f < or > or = or u< -> ALWAYS */
> +};
> +
> +#define TRAP_UNCOND (-1)
> +#define TRAP_HELPER (-2)
> +
> +static int precheck_trap(DisasContext *ctx)
> {
> - /* Trap never */
> - if (TO(ctx->opcode) == 0) {
> - return true;
> + int cond = TO2tcg[TO(ctx->opcode)];
> +
> + /* Weird traps go to helper */
> + if (cond < 0) {
> + return TRAP_HELPER;
> }
> - /* Trap always */
> - if (TO(ctx->opcode) == 31) {
> + /* Unconditionals */
> + if (cond == TCG_COND_ALWAYS) {
> gen_exception_err(ctx, POWERPC_EXCP_PROGRAM, POWERPC_EXCP_TRAP);
> - return true;
> + return TRAP_UNCOND;
> }
> - return false;
> + if (cond == TCG_COND_NEVER) {
> + return TRAP_UNCOND;
> + }
> + /* Invert the condition as we branch over the exception when the
> + * condition is *not* met
> + */
> + return tcg_invert_cond(cond);
> +}
> +
> +static void gen_trap(DisasContext *ctx)
> +{
> + TCGv_i32 t0, t1;
> +
> + t0 = tcg_const_i32(POWERPC_EXCP_PROGRAM);
> + t1 = tcg_const_i32(POWERPC_EXCP_TRAP);
> + gen_update_nip(ctx, ctx->nip - 4);
> + gen_helper_raise_exception_err(cpu_env, t0, t1);
> + tcg_temp_free_i32(t0);
> + tcg_temp_free_i32(t1);
> }
>
> /* tw */
> static void gen_tw(DisasContext *ctx)
> {
> - TCGv_i32 t0;
> + int cond = precheck_trap(ctx);
> + TCGLabel *l1;
> + TCGv t0;
> + TCGv t1;
>
> - if (check_unconditional_trap(ctx)) {
> + if (cond == TRAP_UNCOND) {
> + return;
> + } else if (cond == TRAP_HELPER) {
> + TCGv_i32 trapop = tcg_const_i32(TO(ctx->opcode));
> + gen_helper_tw(cpu_env, cpu_gpr[rA(ctx->opcode)],
> + cpu_gpr[rB(ctx->opcode)], trapop);
> + tcg_temp_free_i32(trapop);
> return;
> }
> - t0 = tcg_const_i32(TO(ctx->opcode));
> - gen_helper_tw(cpu_env, cpu_gpr[rA(ctx->opcode)], cpu_gpr[rB(ctx->opcode)],
> - t0);
> - tcg_temp_free_i32(t0);
> + l1 = gen_new_label();
> + t0 = tcg_temp_new();
> + t1 = tcg_temp_new();
> + tcg_gen_ext32s_tl(t0, cpu_gpr[rA(ctx->opcode)]);
> + tcg_gen_ext32s_tl(t1, cpu_gpr[rB(ctx->opcode)]);
> + tcg_gen_brcond_tl(cond, t0, t1, l1);
> + gen_trap(ctx);
> + gen_set_label(l1);
> + tcg_temp_free(t0);
> + tcg_temp_free(t1);
> }
>
> /* twi */
> static void gen_twi(DisasContext *ctx)
> {
> + int cond = precheck_trap(ctx);
> + TCGLabel *l1;
> TCGv t0;
> - TCGv_i32 t1;
>
> - if (check_unconditional_trap(ctx)) {
> + if (cond == TRAP_UNCOND) {
> + return;
> + } else if (cond == TRAP_HELPER) {
> + TCGv_i32 trapop = tcg_const_i32(TO(ctx->opcode));
> + t0 = tcg_const_tl(SIMM(ctx->opcode));
> + gen_helper_tw(cpu_env, cpu_gpr[rA(ctx->opcode)], t0, trapop);
> + tcg_temp_free_i32(trapop);
> + tcg_temp_free(t0);
> return;
> }
> - t0 = tcg_const_tl(SIMM(ctx->opcode));
> - t1 = tcg_const_i32(TO(ctx->opcode));
> - gen_helper_tw(cpu_env, cpu_gpr[rA(ctx->opcode)], t0, t1);
> + l1 = gen_new_label();
> + t0 = tcg_temp_new();
> + tcg_gen_ext32s_tl(t0, cpu_gpr[rA(ctx->opcode)]);
> + tcg_gen_brcondi_tl(cond, t0, SIMM(ctx->opcode), l1);
> + gen_trap(ctx);
> + gen_set_label(l1);
> tcg_temp_free(t0);
> - tcg_temp_free_i32(t1);
> }
>
> #if defined(TARGET_PPC64)
> /* td */
> static void gen_td(DisasContext *ctx)
> {
> - TCGv_i32 t0;
> + int cond = precheck_trap(ctx);
> + TCGLabel *l1;
>
> - if (check_unconditional_trap(ctx)) {
> + if (cond == TRAP_UNCOND) {
> + return;
> + } else if (cond == TRAP_HELPER) {
> + TCGv_i32 trapop = tcg_const_i32(TO(ctx->opcode));
> + gen_helper_td(cpu_env, cpu_gpr[rA(ctx->opcode)],
> + cpu_gpr[rB(ctx->opcode)], trapop);
> + tcg_temp_free_i32(trapop);
> return;
> }
> - t0 = tcg_const_i32(TO(ctx->opcode));
> - gen_helper_td(cpu_env, cpu_gpr[rA(ctx->opcode)], cpu_gpr[rB(ctx->opcode)],
> - t0);
> - tcg_temp_free_i32(t0);
> + l1 = gen_new_label();
> + tcg_gen_brcond_tl(cond, cpu_gpr[rA(ctx->opcode)],
> + cpu_gpr[rB(ctx->opcode)], l1);
> + gen_trap(ctx);
> + gen_set_label(l1);
> }
>
> /* tdi */
> static void gen_tdi(DisasContext *ctx)
> {
> - TCGv t0;
> - TCGv_i32 t1;
> + int cond = precheck_trap(ctx);
> + TCGLabel *l1;
>
> - if (check_unconditional_trap(ctx)) {
> + if (cond == TRAP_UNCOND) {
> + return;
> + } else if (cond == TRAP_HELPER) {
> + TCGv_i32 trapop = tcg_const_i32(TO(ctx->opcode));
> + TCGv t0 = tcg_const_tl(SIMM(ctx->opcode));
> + gen_helper_td(cpu_env, cpu_gpr[rA(ctx->opcode)], t0, trapop);
> + tcg_temp_free_i32(trapop);
> + tcg_temp_free(t0);
> return;
> }
> - t0 = tcg_const_tl(SIMM(ctx->opcode));
> - t1 = tcg_const_i32(TO(ctx->opcode));
> - gen_helper_td(cpu_env, cpu_gpr[rA(ctx->opcode)], t0, t1);
> - tcg_temp_free(t0);
> - tcg_temp_free_i32(t1);
> + l1 = gen_new_label();
> + tcg_gen_brcondi_tl(cond, cpu_gpr[rA(ctx->opcode)], SIMM(ctx->opcode), l1);
> + gen_trap(ctx);
> + gen_set_label(l1);
> }
> -#endif
> +#endif /* defined(TARGET_PPC64) */
>
> /*** Processor control ***/
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-08-09 2:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-31 5:13 [Qemu-devel] [PATCH 1/5] ppc: Don't generate dead code on unconditional branches Benjamin Herrenschmidt
2016-07-31 5:13 ` [Qemu-devel] [PATCH 2/5] ppc: Improve flags for helpers loading/writing the time facilities Benjamin Herrenschmidt
2016-08-06 8:46 ` Richard Henderson
2016-07-31 5:13 ` [Qemu-devel] [PATCH 3/5] ppc: Improve the exception helpers flags Benjamin Herrenschmidt
2016-08-06 8:46 ` Richard Henderson
2016-07-31 5:13 ` [Qemu-devel] [PATCH 4/5] ppc: Improve a few more helper flags Benjamin Herrenschmidt
2016-08-06 8:47 ` Richard Henderson
2016-07-31 5:13 ` [Qemu-devel] [PATCH 5/5] ppc: Improve generation of conditional traps Benjamin Herrenschmidt
2016-08-01 6:24 ` David Gibson
2016-08-06 9:03 ` Richard Henderson
2016-08-07 0:47 ` Benjamin Herrenschmidt
2016-08-09 2:07 ` David Gibson [this message]
2016-08-09 4:03 ` Benjamin Herrenschmidt
2016-08-06 9:05 ` [Qemu-devel] [PATCH 1/5] ppc: Don't generate dead code on unconditional branches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160809020740.GC9057@voom.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=benh@kernel.crashing.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.