From patchwork Wed Apr 14 20:29:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 51203 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 02F54B7D54 for ; Thu, 29 Apr 2010 05:16:52 +1000 (EST) Received: from localhost ([127.0.0.1]:46771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7Cka-0003yl-Lr for incoming@patchwork.ozlabs.org; Wed, 28 Apr 2010 15:16:48 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7C1r-0000QG-Rj for qemu-devel@nongnu.org; Wed, 28 Apr 2010 14:30:35 -0400 Received: from [140.186.70.92] (port=46723 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7C1b-0000Hx-9C for qemu-devel@nongnu.org; Wed, 28 Apr 2010 14:30:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7C1S-0004Sf-AG for qemu-devel@nongnu.org; Wed, 28 Apr 2010 14:30:18 -0400 Received: from are.twiddle.net ([75.149.56.221]:36492) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7C1S-0004S4-4G for qemu-devel@nongnu.org; Wed, 28 Apr 2010 14:30:10 -0400 Received: by are.twiddle.net (Postfix, from userid 5000) id 91B5E107E; Wed, 28 Apr 2010 11:30:06 -0700 (PDT) Message-Id: <4bba2d47c5a2b61e2e68b0546f27183b7277a5d4.1272479073.git.rth@twiddle.net> In-Reply-To: References: From: Richard Henderson Date: Wed, 14 Apr 2010 13:29:27 -0700 To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 21/22] tcg-i386: Use lea for three-operand add. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The result is shorter than the mov+add that TCG would otherwise generate for us. Signed-off-by: Richard Henderson Acked-by: Aurelien Jarno --- tcg/i386/tcg-target.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index 755d46d..646a7b6 100644 --- a/tcg/i386/tcg-target.c +++ b/tcg/i386/tcg-target.c @@ -1186,6 +1186,25 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_st_i32: tcg_out_st(s, TCG_TYPE_I32, args[0], args[1], args[2]); break; + case INDEX_op_add_i32: + /* For 3-operand addition, use LEA. */ + if (args[0] != args[1]) { + TCGArg a0 = args[0], a1 = args[1], a2 = args[2], c3 = 0; + + if (const_args[2]) { + c3 = a2, a2 = -1; + } else if (a0 == a2) { + /* Watch out for dest = src + dest, since we've removed + the matching constraint on the add. */ + tgen_arithr(s, ARITH_ADD, a0, a1); + break; + } + + tcg_out_modrm_sib_offset(s, OPC_LEA, a0, a1, a2, 0, c3); + break; + } + c = ARITH_ADD; + goto gen_arith; case INDEX_op_sub_i32: c = ARITH_SUB; goto gen_arith; @@ -1198,8 +1217,6 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_xor_i32: c = ARITH_XOR; goto gen_arith; - case INDEX_op_add_i32: - c = ARITH_ADD; gen_arith: if (const_args[2]) { tgen_arithi(s, c, args[0], args[2], 0); @@ -1374,7 +1391,7 @@ static const TCGTargetOpDef x86_op_defs[] = { { INDEX_op_st16_i32, { "r", "r" } }, { INDEX_op_st_i32, { "r", "r" } }, - { INDEX_op_add_i32, { "r", "0", "ri" } }, + { INDEX_op_add_i32, { "r", "r", "ri" } }, { INDEX_op_sub_i32, { "r", "0", "ri" } }, { INDEX_op_mul_i32, { "r", "0", "ri" } }, { INDEX_op_mulu2_i32, { "a", "d", "a", "r" } },