From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2KHq-0007ai-Su for qemu-devel@nongnu.org; Tue, 09 Jun 2015 10:13:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2KHp-0004GR-H6 for qemu-devel@nongnu.org; Tue, 09 Jun 2015 10:13:54 -0400 Received: from mail-vn0-x229.google.com ([2607:f8b0:400c:c0f::229]:39105) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2KHp-0004G2-DE for qemu-devel@nongnu.org; Tue, 09 Jun 2015 10:13:53 -0400 Received: by vnbg190 with SMTP id g190so2966993vnb.6 for ; Tue, 09 Jun 2015 07:13:53 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Tue, 9 Jun 2015 07:13:03 -0700 Message-Id: <1433859185-24874-8-git-send-email-rth@twiddle.net> In-Reply-To: <1433859185-24874-1-git-send-email-rth@twiddle.net> References: <1433859185-24874-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 7/9] tcg/optimize: fold temp copies test in tcg_opt_gen_mov List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aurelien@aurel32.net From: Aurelien Jarno Each call to tcg_opt_gen_mov is preceeded by a test to check if the source and destination temps are copies. Fold that into the tcg_opt_gen_mov function. Cc: Richard Henderson Signed-off-by: Aurelien Jarno Message-Id: <1433447607-31184-4-git-send-email-aurelien@aurel32.net> Signed-off-by: Richard Henderson --- tcg/optimize.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index db15976..d5c0398 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -196,6 +196,11 @@ static bool temps_are_copies(TCGArg arg1, TCGArg arg2) static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg *args, TCGArg dst, TCGArg src) { + if (temps_are_copies(dst, src)) { + tcg_op_remove(s, op); + return; + } + TCGOpcode new_op = op_to_mov(op->opc); tcg_target_ulong mask; @@ -788,11 +793,7 @@ static void tcg_constant_folding(TCGContext *s) } break; do_mov3: - if (temps_are_copies(args[0], args[1])) { - tcg_op_remove(s, op); - } else { - tcg_opt_gen_mov(s, op, args, args[0], args[1]); - } + tcg_opt_gen_mov(s, op, args, args[0], args[1]); continue; default: break; @@ -947,9 +948,7 @@ static void tcg_constant_folding(TCGContext *s) } if (affected == 0) { assert(nb_oargs == 1); - if (temps_are_copies(args[0], args[1])) { - tcg_op_remove(s, op); - } else if (temps[args[1]].state != TCG_TEMP_CONST) { + if (temps[args[1]].state != TCG_TEMP_CONST) { tcg_opt_gen_mov(s, op, args, args[0], args[1]); } else { tcg_opt_gen_movi(s, op, args, @@ -979,9 +978,7 @@ static void tcg_constant_folding(TCGContext *s) CASE_OP_32_64(or): CASE_OP_32_64(and): if (temps_are_copies(args[1], args[2])) { - if (temps_are_copies(args[0], args[1])) { - tcg_op_remove(s, op); - } else if (temps[args[1]].state != TCG_TEMP_CONST) { + if (temps[args[1]].state != TCG_TEMP_CONST) { tcg_opt_gen_mov(s, op, args, args[0], args[1]); } else { tcg_opt_gen_movi(s, op, args, @@ -1013,10 +1010,6 @@ static void tcg_constant_folding(TCGContext *s) allocator where needed and possible. Also detect copies. */ switch (opc) { CASE_OP_32_64(mov): - if (temps_are_copies(args[0], args[1])) { - tcg_op_remove(s, op); - break; - } if (temps[args[1]].state != TCG_TEMP_CONST) { tcg_opt_gen_mov(s, op, args, args[0], args[1]); break; @@ -1118,9 +1111,7 @@ static void tcg_constant_folding(TCGContext *s) CASE_OP_32_64(movcond): tmp = do_constant_folding_cond(opc, args[1], args[2], args[5]); if (tmp != 2) { - if (temps_are_copies(args[0], args[4-tmp])) { - tcg_op_remove(s, op); - } else if (temps[args[4-tmp]].state == TCG_TEMP_CONST) { + if (temps[args[4-tmp]].state == TCG_TEMP_CONST) { tcg_opt_gen_movi(s, op, args, args[0], temps[args[4-tmp]].val); } else { -- 2.4.2