From patchwork Tue Oct 2 18:32:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 188610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C43282C00A3 for ; Wed, 3 Oct 2012 04:35:05 +1000 (EST) Received: from localhost ([::1]:38788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ7J9-0007y8-Js for incoming@patchwork.ozlabs.org; Tue, 02 Oct 2012 14:35:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ7Iq-0007tA-Si for qemu-devel@nongnu.org; Tue, 02 Oct 2012 14:34:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJ7Il-0008Cl-0D for qemu-devel@nongnu.org; Tue, 02 Oct 2012 14:34:44 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:35104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ7Ik-0007kE-Pu for qemu-devel@nongnu.org; Tue, 02 Oct 2012 14:34:38 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so9148949pbb.4 for ; Tue, 02 Oct 2012 11:34:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=NthQPk3WHOS+fYE1iY/EaGZP57IzFVwF2szFms68ihU=; b=IxUYK3+kC02lxCjLXJKCumyzcin34kK91I8w2N1eAtC2LIZ9/taq1acFINiXHFp50p bgUzk8BCk/NcdDpiqNfMlrcv1d0rQugdeyxPVAxl51WkelggA/mQdGYLb/L6eJdPheiq kpZi4CBdT5JiUGlqZd+pbvayTaqroQkFWihQvQqLaaKej+PlTaRVcdtLdirP44YsGV93 LYnSWNpEOvguEeVMq/ydYeYuQKukHiz/zzvUJkZqu/GcbCi2r6KzzFjSeZagpLivoqEx VxVYjkPzGOzO+6W1SIM7mfxcM4XFBXsDEmk/zoKKgg0AbFRFwlUJ00Eb51tVSTIVK7Cz ZbXw== Received: by 10.68.232.194 with SMTP id tq2mr6427167pbc.111.1349202878448; Tue, 02 Oct 2012 11:34:38 -0700 (PDT) Received: from pebble.twiddle.home (me00536d0.tmodns.net. [208.54.5.224]) by mx.google.com with ESMTPS id nu8sm1259765pbc.45.2012.10.02.11.34.26 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 11:34:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 2 Oct 2012 11:32:28 -0700 Message-Id: <1349202750-16815-9-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349202750-16815-1-git-send-email-rth@twiddle.net> References: <1349202750-16815-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH 08/10] tcg: Constant fold add2 and sub2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- tcg/optimize.c | 35 +++++++++++++++++++++++++++++++++++ tcg/tcg-op.h | 9 +++++++++ 2 files changed, 44 insertions(+) diff --git a/tcg/optimize.c b/tcg/optimize.c index d9251e4..05891ef 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -796,6 +796,41 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, } goto do_default; + case INDEX_op_add2_i32: + case INDEX_op_sub2_i32: + if (temps[args[2]].state == TCG_TEMP_CONST + && temps[args[3]].state == TCG_TEMP_CONST + && temps[args[4]].state == TCG_TEMP_CONST + && temps[args[5]].state == TCG_TEMP_CONST) { + uint32_t al = temps[args[2]].val; + uint32_t ah = temps[args[3]].val; + uint32_t bl = temps[args[4]].val; + uint32_t bh = temps[args[5]].val; + uint64_t a = ((uint64_t)ah << 32) | al; + uint64_t b = ((uint64_t)bh << 32) | bl; + TCGArg rl, rh; + + if (op == INDEX_op_add2_i32) { + a += b; + } else { + a -= b; + } + + /* We emit the extra nop when we emit the add2/sub2. */ + assert(gen_opc_buf[op_index + 1] == INDEX_op_nop); + + rl = args[0]; + rh = args[1]; + gen_opc_buf[op_index] = INDEX_op_movi_i32; + gen_opc_buf[++op_index] = INDEX_op_movi_i32; + tcg_opt_gen_movi(&gen_args[0], rl, (uint32_t)a); + tcg_opt_gen_movi(&gen_args[2], rh, (uint32_t)(a >> 32)); + gen_args += 4; + args += 6; + break; + } + goto do_default; + case INDEX_op_brcond2_i32: tmp = do_constant_folding_cond2(&args[0], &args[2], args[4]); if (tmp != 2) { diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index bd93fe4..1f5a021 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -25,6 +25,11 @@ int gen_new_label(void); +static inline void tcg_gen_op0(TCGOpcode opc) +{ + *gen_opc_ptr++ = opc; +} + static inline void tcg_gen_op1_i32(TCGOpcode opc, TCGv_i32 arg1) { *gen_opc_ptr++ = opc; @@ -866,6 +871,8 @@ static inline void tcg_gen_add_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2) tcg_gen_op6_i32(INDEX_op_add2_i32, TCGV_LOW(ret), TCGV_HIGH(ret), TCGV_LOW(arg1), TCGV_HIGH(arg1), TCGV_LOW(arg2), TCGV_HIGH(arg2)); + /* Allow the optimizer room to replace add2 with two moves. */ + tcg_gen_op0(INDEX_op_nop); } static inline void tcg_gen_sub_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2) @@ -873,6 +880,8 @@ static inline void tcg_gen_sub_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2) tcg_gen_op6_i32(INDEX_op_sub2_i32, TCGV_LOW(ret), TCGV_HIGH(ret), TCGV_LOW(arg1), TCGV_HIGH(arg1), TCGV_LOW(arg2), TCGV_HIGH(arg2)); + /* Allow the optimizer room to replace sub2 with two moves. */ + tcg_gen_op0(INDEX_op_nop); } static inline void tcg_gen_and_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)