From patchwork Fri Sep 21 17:13:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 185851 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 9C4AB2C0085 for ; Sat, 22 Sep 2012 03:15:46 +1000 (EST) Received: from localhost ([::1]:45388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF6pM-0000Xm-Mh for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2012 13:15:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF6o8-00067x-TO for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:14:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF6o4-0003Ow-Cm for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:14:28 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:62315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF6o4-0003O1-6J for qemu-devel@nongnu.org; Fri, 21 Sep 2012 13:14:24 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so8127973pbb.4 for ; Fri, 21 Sep 2012 10:14:23 -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=ELXQ0Ym5oYd9EWHgY1QKhGvISMUx4eQDshKNHwbXjtA=; b=nG0sPGrOd8ktfxiEj6ubSOY3TKvyebRfaBCjugAlIsJKz07mVyPEqI/ihAyhrEHEEl +iCojoyfip5KZqCPSN3E3wVdrjASqMes/4MNEu8Gv3vCmkYkjdcXWLE+MwhBGDYGU4sp z6XcFsVp9pQTNEdxjNI0qjxwCwfIJvDKYL5tsi8dfwJCbaeFW46ITFWE8puz4inGO0wf nIfudXUB5hUGskFOwOo+zyOJJbmz3eUJS6d0oLtv29VV939newy22YxZwcxdGTbrpGyO xKtHP+PAYODhin+OjzuvVTG+sGCUsXuSIZZ7mQTX9XEJQHUb9WsD4a273iF7jtnbPTBW ujUw== Received: by 10.68.193.194 with SMTP id hq2mr17454597pbc.93.1348247663873; Fri, 21 Sep 2012 10:14:23 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id gf8sm5389723pbc.52.2012.09.21.10.14.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Sep 2012 10:14:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 21 Sep 2012 10:13:38 -0700 Message-Id: <1348247620-12734-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348247620-12734-1-git-send-email-rth@twiddle.net> References: <1348247620-12734-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 5/7] 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 --- tcg/optimize.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 26038a6..1be7631 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -334,6 +334,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' @@ -395,13 +397,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; }