From patchwork Tue Sep 18 14:24:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 184734 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 E22062C0083 for ; Wed, 19 Sep 2012 00:24:28 +1000 (EST) Received: from localhost ([::1]:46143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDyiw-0001ds-Hr for incoming@patchwork.ozlabs.org; Tue, 18 Sep 2012 10:24:26 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDyim-0001dg-Kv for qemu-devel@nongnu.org; Tue, 18 Sep 2012 10:24:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDyii-0002Jm-El for qemu-devel@nongnu.org; Tue, 18 Sep 2012 10:24:16 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:34846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDyii-0002Hy-89 for qemu-devel@nongnu.org; Tue, 18 Sep 2012 10:24:12 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so94988pbb.4 for ; Tue, 18 Sep 2012 07:24:11 -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=8zJsYe6PSAHDfryBlay2vnVNpalbiQLIwBr6in38h94=; b=ASbUAj6LoVAQBD574Xeumf5H3lmRZbQwQjxiVYIY55SQl5SN59JgiFah7QLrxDMX7V 5gj6BJZeDgdicf3dv6qkZ9JJhMrIGSSe3srNT2S1J/OlFIQonmOvwItn61ACBTr38E1x VSF0Qmjaa6+AhTI1clskwuXr5EdgyTEC+m2CirigKR8kuk+ATL9HKhPyDWDaL8lMNMpg Jgh8/GbxCs7SSpuY8K06RouwCupjMxDAJOYHz4BiNUPT3C9ccBEULl3+X4XFEodY6mRf pIprGiXW77XFZttC3xPWMLvdDxsw7Wih4V8oT8mTxHfCuqD1cbxjuI9STPqX9Uo4mnDw TnCw== Received: by 10.68.235.38 with SMTP id uj6mr117475pbc.3.1347978251905; Tue, 18 Sep 2012 07:24:11 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id kp3sm47900pbc.64.2012.09.18.07.24.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Sep 2012 07:24:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 18 Sep 2012 07:24:00 -0700 Message-Id: <1347978240-20260-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1347978240-20260-1-git-send-email-rth@twiddle.net> References: <1347978240-20260-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@aurel32.net Subject: [Qemu-devel] [PATCH 5/5] tcg: Optimize two-address commutative operations 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 While swapping constants to the second operand, swap sources matching destinations to the first operand. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- tcg/optimize.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 5b0a8ce..becc408 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -337,6 +337,8 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, const TCGOpDef *def; TCGArg *gen_args; TCGArg tmp; + TCGCond cond; + /* Array VALS has an element for each temp. If this temp holds a constant then its value is kept in VALS' element. If this temp is a copy of other ones then this equivalence class' @@ -363,7 +365,8 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, } } - /* For commutative operations make constant second argument */ + /* For commutative operations make constant second argument, or + if the destination is an input, make it the first argument. */ switch (op) { CASE_OP_32_64(add): CASE_OP_32_64(mul): @@ -373,7 +376,9 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, CASE_OP_32_64(eqv): CASE_OP_32_64(nand): CASE_OP_32_64(nor): - if (temps[args[1]].state == TCG_TEMP_CONST) { + if (temps[args[1]].state == TCG_TEMP_CONST + || (args[0] == args[2] + && temps[args[1]].state != TCG_TEMP_CONST)) { tmp = args[1]; args[1] = args[2]; args[2] = tmp; @@ -398,13 +403,24 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, } break; CASE_OP_32_64(movcond): + cond = args[5]; if (temps[args[1]].state == TCG_TEMP_CONST && temps[args[2]].state != TCG_TEMP_CONST) { tmp = args[1]; args[1] = args[2]; args[2] = tmp; - args[5] = tcg_swap_cond(args[5]); + cond = tcg_swap_cond(cond); + } + /* For movcond, we canonicalize the "false" input reg to match + the destination reg so that the tcg backend can implement + a "move if true" operation. */ + if (args[0] == args[3]) { + tmp = args[3]; + args[3] = args[4]; + args[4] = tmp; + cond = tcg_invert_cond(cond); } + args[5] = cond; default: break; }