From patchwork Tue Apr 2 04:23:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 232863 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 94BFF2C0131 for ; Tue, 2 Apr 2013 15:28:39 +1100 (EST) Received: from localhost ([::1]:45991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMspp-0008CJ-Nd for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 00:28:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMsli-00034S-H7 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 00:24:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UMslf-0007OD-46 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 00:24:22 -0400 Received: from mail-gg0-x229.google.com ([2607:f8b0:4002:c02::229]:49931) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMslf-0007O3-0E for qemu-devel@nongnu.org; Tue, 02 Apr 2013 00:24:19 -0400 Received: by mail-gg0-f169.google.com with SMTP id j5so2832ggn.28 for ; Mon, 01 Apr 2013 21:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=Fin6ssxcixTqvYpx114/ViXF8fXJ9vTtPxo4JqxrpNI=; b=A/6ICSG8JeFXAkUlpUgOaVGKQ/g4Ho6NtB05gd468uopJoNkSoxGtZeYFKEDBdCxQH nW1MQL/q/Zs2/E2F+cbNFSg36po/Kz0yYk96yfVn3h+gguFMPCxP0teuA/nCli1O/IDJ 8PJDCYIilhRm2rmGlft/ZeSjiQyjM4ztWawJe/qmwzjtegfax7jIZT89TgRDnhwMfj8h gE/wei5AZnmONE0izesPI0XMT04bbnnOgx5f1YJi6Ex0iavUClWhQsbBp9XE0MUPMRNh 0ie1KCcsWgzZLTMunbtBEm8FsyG+wxOce5yjO0u6doAb6vYR2NzicPILUt3cHubcQg6d Xc5A== X-Received: by 10.236.133.194 with SMTP id q42mr12753653yhi.174.1364876658649; Mon, 01 Apr 2013 21:24:18 -0700 (PDT) Received: from pebble.com ([12.236.175.36]) by mx.google.com with ESMTPS id z64sm32502731yhc.24.2013.04.01.21.24.17 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 01 Apr 2013 21:24:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2013 21:23:16 -0700 Message-Id: <1364876610-3933-14-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364876610-3933-1-git-send-email-rth@twiddle.net> References: <1364876610-3933-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c02::229 Cc: av1474@comtv.ru, agraf@suse.de, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH v3 13/27] tcg-ppc64: Improve and_i64 with constant 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 Use RLDICL and RLDICR. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- tcg/ppc64/tcg-target.c | 64 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/tcg/ppc64/tcg-target.c b/tcg/ppc64/tcg-target.c index ad6db6c..51a5545 100644 --- a/tcg/ppc64/tcg-target.c +++ b/tcg/ppc64/tcg-target.c @@ -527,7 +527,7 @@ static void tcg_out_movi(TCGContext *s, TCGType type, TCGReg ret, } } -static inline bool mask_operand(uint32_t c, int *mb, int *me) +static bool mask_operand(uint32_t c, int *mb, int *me) { uint32_t lsb, test; @@ -551,6 +551,30 @@ static inline bool mask_operand(uint32_t c, int *mb, int *me) return true; } +static bool mask64_operand(uint64_t c, int *mb, int *me) +{ + uint64_t lsb; + + if (c == 0) { + return false; + } + + lsb = c & -c; + /* Accept 1..10..0. */ + if (c == -lsb) { + *mb = 0; + *me = clz64(lsb); + return true; + } + /* Accept 0..01..1. */ + if (lsb == 1 && (c & (c + 1)) == 0) { + *mb = clz64(c + 1) + 1; + *me = 63; + return true; + } + return false; +} + static void tcg_out_andi32(TCGContext *s, TCGReg dst, TCGReg src, uint32_t c) { int mb, me; @@ -569,6 +593,28 @@ static void tcg_out_andi32(TCGContext *s, TCGReg dst, TCGReg src, uint32_t c) } } +static void tcg_out_andi64(TCGContext *s, TCGReg dst, TCGReg src, uint64_t c) +{ + int mb, me; + + if ((c & 0xffff) == c) { + tcg_out32(s, ANDI | SAI(src, dst, c)); + return; + } else if ((c & 0xffff0000) == c) { + tcg_out32(s, ANDIS | SAI(src, dst, c >> 16)); + return; + } else if (mask64_operand(c, &mb, &me)) { + if (mb == 0) { + tcg_out_rld(s, RLDICR, dst, src, 0, me); + } else { + tcg_out_rld(s, RLDICL, dst, src, 0, mb); + } + } else { + tcg_out_movi(s, TCG_TYPE_I64, 0, c); + tcg_out32(s, AND | SAB(src, dst, 0)); + } +} + static void tcg_out_zori32(TCGContext *s, TCGReg dst, TCGReg src, uint32_t c, int op_lo, int op_hi) { @@ -1397,20 +1443,10 @@ static void tcg_out_op (TCGContext *s, TCGOpcode opc, const TCGArg *args, break; case INDEX_op_and_i64: if (const_args[2]) { - if ((args[2] & 0xffff) == args[2]) { - tcg_out32(s, ANDI | SAI(args[1], args[0], args[2])); - } else if ((args[2] & 0xffff0000) == args[2]) { - tcg_out32(s, ANDIS | SAI(args[1], args[0], args[2] >> 16)); - } else { - tcg_out_movi (s, (opc == INDEX_op_and_i32 - ? TCG_TYPE_I32 - : TCG_TYPE_I64), - 0, args[2]); - tcg_out32 (s, AND | SAB (args[1], args[0], 0)); - } + tcg_out_andi64(s, args[0], args[1], args[2]); + } else { + tcg_out32(s, AND | SAB(args[1], args[0], args[2])); } - else - tcg_out32 (s, AND | SAB (args[1], args[0], args[2])); break; case INDEX_op_or_i64: case INDEX_op_or_i32: