From: Aurelien Jarno <aurelien@aurel32.net>
To: Richard Henderson <rth@twiddle.net>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 7/7] tcg: Do constant folding on double-word comparisons
Date: Mon, 1 Oct 2012 20:50:35 +0200 [thread overview]
Message-ID: <20121001185035.GE4623@ohm.aurel32.net> (raw)
In-Reply-To: <1348766397-20731-8-git-send-email-rth@twiddle.net>
On Thu, Sep 27, 2012 at 10:19:57AM -0700, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
> tcg/optimize.c | 134 ++++++++++++++++++++++++++++++++++++++++-----------------
> 1 file changed, 94 insertions(+), 40 deletions(-)
>
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index dfac877..f6a16fd 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -398,6 +398,40 @@ static TCGArg do_constant_folding_cond(TCGOpcode op, TCGArg x,
> }
> }
>
> +/* Return 2 if the condition can't be simplified, and the result
> + of the condition (0 or 1) if it can */
> +static TCGArg do_constant_folding_cond2(TCGArg *p1, TCGArg *p2, TCGCond c)
> +{
> + TCGArg al = p1[0], ah = p1[1];
> + TCGArg bl = p2[0], bh = p2[1];
> +
> + if (temps[bl].state == TCG_TEMP_CONST
> + && temps[bh].state == TCG_TEMP_CONST) {
> + uint64_t b = ((uint64_t)temps[bh].val << 32) | (uint32_t)temps[bl].val;
> +
> + if (temps[al].state == TCG_TEMP_CONST
> + && temps[ah].state == TCG_TEMP_CONST) {
> + uint64_t a;
> + a = ((uint64_t)temps[ah].val << 32) | (uint32_t)temps[al].val;
> + return do_constant_folding_cond_64(a, b, c);
> + }
> + if (b == 0) {
> + switch (c) {
> + case TCG_COND_LTU:
> + return 0;
> + case TCG_COND_GEU:
> + return 1;
> + default:
> + break;
> + }
> + }
> + }
> + if (temps_are_copies(al, bl) && temps_are_copies(ah, bh)) {
> + return do_constant_folding_cond_eq(c);
> + }
> + return 2;
> +}
> +
> static bool swap_commutative(TCGArg dest, TCGArg *p1, TCGArg *p2)
> {
> TCGArg a1 = *p1, a2 = *p2;
> @@ -816,53 +850,73 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
> args += 6;
> break;
> case INDEX_op_brcond2_i32:
> - /* Simplify LT/GE comparisons vs zero to a single compare
> - vs the high word of the input. */
> - if ((args[4] == TCG_COND_LT || args[4] == TCG_COND_GE)
> - && temps[args[2]].state == TCG_TEMP_CONST
> - && temps[args[3]].state == TCG_TEMP_CONST
> - && temps[args[2]].val == 0
> - && temps[args[2]].val == 0) {
> - gen_opc_buf[op_index] = INDEX_op_brcond_i32;
> - args[0] = args[1];
> - args[1] = args[3];
> - args[2] = args[4];
> - args[3] = args[5];
> - gen_args += 4;
> + tmp = do_constant_folding_cond2(&args[0], &args[2], args[4]);
> + if (tmp != 2) {
> + if (tmp) {
> + gen_opc_buf[op_index] = INDEX_op_br;
> + gen_args[0] = args[5];
> + gen_args += 1;
> + } else {
> + gen_opc_buf[op_index] = INDEX_op_nop;
> + args += 6;
> + break;
> + }
> } else {
> - gen_args[0] = args[0];
> - gen_args[1] = args[1];
> - gen_args[2] = args[2];
> - gen_args[3] = args[3];
> - gen_args[4] = args[4];
> - gen_args[5] = args[5];
> - gen_args += 6;
> + /* Simplify LT/GE comparisons vs zero to a single compare
> + vs the high word of the input. */
> + if ((args[4] == TCG_COND_LT || args[4] == TCG_COND_GE)
> + && temps[args[2]].state == TCG_TEMP_CONST
> + && temps[args[3]].state == TCG_TEMP_CONST
> + && temps[args[2]].val == 0
> + && temps[args[2]].val == 0) {
> + gen_opc_buf[op_index] = INDEX_op_brcond_i32;
> + args[0] = args[1];
> + args[1] = args[3];
> + args[2] = args[4];
> + args[3] = args[5];
> + gen_args += 4;
> + } else {
> + gen_args[0] = args[0];
> + gen_args[1] = args[1];
> + gen_args[2] = args[2];
> + gen_args[3] = args[3];
> + gen_args[4] = args[4];
> + gen_args[5] = args[5];
> + gen_args += 6;
> + }
> }
> memset(temps, 0, nb_temps * sizeof(struct tcg_temp_info));
> args += 6;
> break;
> case INDEX_op_setcond2_i32:
> - /* Simplify LT/GE comparisons vs zero to a single compare
> - vs the high word of the input. */
> - if ((args[5] == TCG_COND_LT || args[5] == TCG_COND_GE)
> - && temps[args[3]].state == TCG_TEMP_CONST
> - && temps[args[4]].state == TCG_TEMP_CONST
> - && temps[args[3]].val == 0
> - && temps[args[4]].val == 0) {
> - gen_opc_buf[op_index] = INDEX_op_setcond_i32;
> - args[1] = args[2];
> - args[2] = args[4];
> - args[3] = args[5];
> - gen_args += 4;
> + tmp = do_constant_folding_cond2(&args[1], &args[3], args[5]);
> + if (tmp != 2) {
> + gen_opc_buf[op_index] = INDEX_op_movi_i32;
> + tcg_opt_gen_movi(gen_args, args[0], tmp);
> + gen_args += 2;
> } else {
> - reset_temp(args[0]);
> - gen_args[0] = args[0];
> - gen_args[1] = args[1];
> - gen_args[2] = args[2];
> - gen_args[3] = args[3];
> - gen_args[4] = args[4];
> - gen_args[5] = args[5];
> - gen_args += 6;
> + /* Simplify LT/GE comparisons vs zero to a single compare
> + vs the high word of the input. */
> + if ((args[5] == TCG_COND_LT || args[5] == TCG_COND_GE)
> + && temps[args[3]].state == TCG_TEMP_CONST
> + && temps[args[4]].state == TCG_TEMP_CONST
> + && temps[args[3]].val == 0
> + && temps[args[4]].val == 0) {
> + gen_opc_buf[op_index] = INDEX_op_setcond_i32;
> + args[1] = args[2];
> + args[2] = args[4];
> + args[3] = args[5];
> + gen_args += 4;
> + } else {
> + reset_temp(args[0]);
> + gen_args[0] = args[0];
> + gen_args[1] = args[1];
> + gen_args[2] = args[2];
> + gen_args[3] = args[3];
> + gen_args[4] = args[4];
> + gen_args[5] = args[5];
> + gen_args += 6;
> + }
> }
> args += 6;
> break;
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
prev parent reply other threads:[~2012-10-01 18:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-27 17:19 [Qemu-devel] [PATCH 0/7] Double-word tcg/optimize improvements Richard Henderson
2012-09-27 17:19 ` [Qemu-devel] [PATCH 1/7] tcg: Split out swap_commutative as a subroutine Richard Henderson
2012-09-27 21:45 ` Aurelien Jarno
2012-09-27 17:19 ` [Qemu-devel] [PATCH 2/7] tcg: Optimize add2 + sub2 Richard Henderson
2012-09-27 23:20 ` Aurelien Jarno
2012-09-27 23:28 ` Richard Henderson
2012-10-01 17:46 ` Aurelien Jarno
2012-10-01 18:41 ` Richard Henderson
2012-09-30 7:04 ` Blue Swirl
2012-10-01 18:36 ` Richard Henderson
2012-09-27 17:19 ` [Qemu-devel] [PATCH 3/7] tcg: Swap commutative double-word comparisons Richard Henderson
2012-09-27 23:22 ` Aurelien Jarno
2012-09-27 17:19 ` [Qemu-devel] [PATCH 4/7] tcg: Optimize double-word comparisons against zero Richard Henderson
2012-10-01 18:43 ` Aurelien Jarno
2012-10-01 18:47 ` Richard Henderson
2012-09-27 17:19 ` [Qemu-devel] [PATCH 5/7] tcg: Split out subroutines from do_constant_folding_cond Richard Henderson
2012-10-01 18:46 ` Aurelien Jarno
2012-09-27 17:19 ` [Qemu-devel] [PATCH 6/7] tcg: Tidy brcond optimization Richard Henderson
2012-10-01 18:48 ` Aurelien Jarno
2012-09-27 17:19 ` [Qemu-devel] [PATCH 7/7] tcg: Do constant folding on double-word comparisons Richard Henderson
2012-10-01 18:50 ` Aurelien Jarno [this message]
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=20121001185035.GE4623@ohm.aurel32.net \
--to=aurelien@aurel32.net \
--cc=qemu-devel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).