From: Aurelien Jarno <aurelien@aurel32.net>
To: Richard Henderson <rth@twiddle.net>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 04/10] tcg: Use common code when failing to optimize
Date: Tue, 9 Oct 2012 17:25:06 +0200 [thread overview]
Message-ID: <20121009152506.GE14078@ohm.aurel32.net> (raw)
In-Reply-To: <1349202750-16815-5-git-send-email-rth@twiddle.net>
On Tue, Oct 02, 2012 at 11:32:24AM -0700, Richard Henderson wrote:
> This saves a whole lot of repetitive code sequences.
>
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
> tcg/optimize.c | 91 +++++++++++++++++++++-------------------------------------
> 1 file changed, 32 insertions(+), 59 deletions(-)
>
> diff --git a/tcg/optimize.c b/tcg/optimize.c
> index a713513..592d166 100644
> --- a/tcg/optimize.c
> +++ b/tcg/optimize.c
> @@ -639,6 +639,7 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
> gen_args += 2;
> args += 2;
> break;
> +
Why this new line?
> CASE_OP_32_64(not):
> CASE_OP_32_64(neg):
> CASE_OP_32_64(ext8s):
> @@ -651,14 +652,12 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
> gen_opc_buf[op_index] = op_to_movi(op);
> tmp = do_constant_folding(op, temps[args[1]].val, 0);
> tcg_opt_gen_movi(gen_args, args[0], tmp);
> - } else {
> - reset_temp(args[0]);
> - gen_args[0] = args[0];
> - gen_args[1] = args[1];
> + gen_args += 2;
> + args += 2;
> + break;
> }
> - gen_args += 2;
> - args += 2;
> - break;
> + goto do_default;
> +
> CASE_OP_32_64(add):
> CASE_OP_32_64(sub):
> CASE_OP_32_64(mul):
> @@ -682,15 +681,11 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
> temps[args[2]].val);
> 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;
> + break;
> }
> - args += 3;
> - break;
> + goto do_default;
> +
> CASE_OP_32_64(deposit):
> if (temps[args[1]].state == TCG_TEMP_CONST
> && temps[args[2]].state == TCG_TEMP_CONST) {
> @@ -700,33 +695,22 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
> | ((temps[args[2]].val & tmp) << args[3]);
> 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;
> + break;
> }
> - args += 5;
> - break;
> + goto do_default;
> +
> CASE_OP_32_64(setcond):
> tmp = do_constant_folding_cond(op, args[1], args[2], args[3]);
> if (tmp != 2) {
> gen_opc_buf[op_index] = op_to_movi(op);
> 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;
> + break;
> }
> - args += 4;
> - break;
> + goto do_default;
> +
> CASE_OP_32_64(brcond):
> tmp = do_constant_folding_cond(op, args[0], args[1], args[2]);
> if (tmp != 2) {
> @@ -738,17 +722,11 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
> } else {
> gen_opc_buf[op_index] = INDEX_op_nop;
> }
> - } else {
> - memset(temps, 0, nb_temps * sizeof(struct tcg_temp_info));
> - 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;
> + break;
> }
> - args += 4;
> - break;
> + goto do_default;
> +
> CASE_OP_32_64(movcond):
> tmp = do_constant_folding_cond(op, args[1], args[2], args[5]);
> if (tmp != 2) {
> @@ -763,18 +741,11 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
> tcg_opt_gen_mov(s, gen_args, args[0], args[4-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;
> + args += 6;
> + break;
> }
> - args += 6;
> - break;
> + goto do_default;
> +
> case INDEX_op_call:
> nb_call_args = (args[0] >> 16) + (args[0] & 0xffff);
> if (!(args[nb_call_args + 1] & (TCG_CALL_CONST | TCG_CALL_PURE))) {
> @@ -793,11 +764,13 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr,
> i--;
> }
> break;
> +
> default:
> - /* Default case: we do know nothing about operation so no
> - propagation is done. We trash everything if the operation
> - is the end of a basic block, otherwise we only trash the
> - output args. */
> + do_default:
> + /* Default case: we know nothing about operation (or were unable
> + to compute the operation result) so no propagation is done.
> + We trash everything if the operation is the end of a basic
> + block, otherwise we only trash the output args. */
> if (def->flags & TCG_OPF_BB_END) {
> memset(temps, 0, nb_temps * sizeof(struct tcg_temp_info));
> } else {
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
next prev parent reply other threads:[~2012-10-09 15:25 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 18:32 [Qemu-devel] [PATCH v2 00/10] Double-word tcg/optimize improvements Richard Henderson
2012-10-02 18:32 ` [Qemu-devel] [PATCH 01/10] tcg: Split out swap_commutative as a subroutine Richard Henderson
2012-10-09 15:13 ` Aurelien Jarno
2012-10-09 15:23 ` Richard Henderson
2012-10-09 15:31 ` Aurelien Jarno
2012-10-09 16:40 ` Richard Henderson
2012-10-02 18:32 ` [Qemu-devel] [PATCH 02/10] tcg: Canonicalize add2 operand ordering Richard Henderson
2012-10-09 15:14 ` Aurelien Jarno
2012-10-02 18:32 ` [Qemu-devel] [PATCH 03/10] tcg: Swap commutative double-word comparisons Richard Henderson
2012-10-09 15:16 ` Aurelien Jarno
2012-10-09 15:31 ` Richard Henderson
2012-10-09 15:48 ` Aurelien Jarno
2012-10-02 18:32 ` [Qemu-devel] [PATCH 04/10] tcg: Use common code when failing to optimize Richard Henderson
2012-10-09 15:25 ` Aurelien Jarno [this message]
2012-10-09 15:33 ` Richard Henderson
2012-10-02 18:32 ` [Qemu-devel] [PATCH 05/10] tcg: Optimize double-word comparisons against zero Richard Henderson
2012-10-09 16:32 ` Aurelien Jarno
2012-10-02 18:32 ` [Qemu-devel] [PATCH 06/10] tcg: Split out subroutines from do_constant_folding_cond Richard Henderson
2012-10-09 16:33 ` Aurelien Jarno
2012-10-02 18:32 ` [Qemu-devel] [PATCH 07/10] tcg: Do constant folding on double-word comparisons Richard Henderson
2012-10-10 9:45 ` Aurelien Jarno
2012-10-02 18:32 ` [Qemu-devel] [PATCH 08/10] tcg: Constant fold add2 and sub2 Richard Henderson
2012-10-10 9:52 ` Aurelien Jarno
2012-10-02 18:32 ` [Qemu-devel] [PATCH 09/10] tcg: Optimize half-dead add2/sub2 Richard Henderson
2012-10-16 23:25 ` Aurelien Jarno
2012-10-02 18:32 ` [Qemu-devel] [PATCH 10/10] tcg: Optimize mulu2 Richard Henderson
2012-10-16 23:25 ` Aurelien Jarno
2012-10-17 1:09 ` Richard Henderson
2012-10-17 10:58 ` Avi Kivity
2012-10-17 16:41 ` [Qemu-devel] [PATCH v2 00/10] Double-word tcg/optimize improvements Aurelien Jarno
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=20121009152506.GE14078@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).