From patchwork Wed Nov 16 19:25:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 695786 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tJvql4Kxpz9t10 for ; Thu, 17 Nov 2016 06:45:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nCimVAZV"; dkim-atps=neutral Received: from localhost ([::1]:54381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7692-0003Rr-UM for incoming@patchwork.ozlabs.org; Wed, 16 Nov 2016 14:45:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c75qh-0004JG-8j for qemu-devel@nongnu.org; Wed, 16 Nov 2016 14:26:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c75qe-00060H-Ir for qemu-devel@nongnu.org; Wed, 16 Nov 2016 14:26:23 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35658) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c75qe-0005zu-C1 for qemu-devel@nongnu.org; Wed, 16 Nov 2016 14:26:20 -0500 Received: by mail-wm0-x242.google.com with SMTP id a20so14361640wme.2 for ; Wed, 16 Nov 2016 11:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GPbu1IJwvENKuNirVysCl7MpULyGr7/k+T7ezPhIgrQ=; b=nCimVAZVFKe0e4qWuzyOKzDJMvdT6WRCvhv8iCoG0flncHckJGnTdWUhQiGDV1APGn jNfoP/w5aj3fF9lvQQHXOoOfWjSlnLL3anHB1kkI6eS2p2paOWPOn2hlFErYcCk7v5Es VTJDajsIeqtl40Pp6RV7Zc7K+LFeUifps/VJhKQ4HoW1vOOGtAiZVHcVTQCJZwH9wt83 fC94AYQXzyaBh+MJHgF3ESUHFYI1h0IE9SYJEFcJjUCeeKDjz+VLLJsPep2DyRvJ5Esk t0UCNGinAgiC81BU5M8JCKkuxAk1YDwj8X52z7tInjCk92zWit8BmI00ua0bQpEliChA 5dlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GPbu1IJwvENKuNirVysCl7MpULyGr7/k+T7ezPhIgrQ=; b=BJOPlwVt8Wj3qf9SD4HCZD97ra1ZranDqdVOd2ciAGhh6TMun0lqIDW2vj/ONjLTKS 4MSEc++c5XYtRGGTb7lPvUBfsNHUGjnePgRsJTQgpJ51dn2G8YzFd4/1Ez3FR4YIAxD0 P2ttRFdIdCZZcJJhyjJ/RoZo7btINWWsZ+xDDPTRZPqGQ6VNMQfCdwUUgf4jRg4kOnbj LMhMKCmdD8Fi+NnNSYWbWv9+MZSjrXwR4iBM97fqKc4o/5301FkhLJff+OOTs37ApziW mt4Al/b4dwgW0PmOOen40KtYVYBup3n0bF1iR4Z70jNp7CoHQeFKN1Q+GX0m3hnviFkL 2NIQ== X-Gm-Message-State: ABUngveHZCGGKxEOMrRW3oHWMq3WbceLFeiLH0XLiWA0rlxE5vu0vsEewP/Heu20/vj9RA== X-Received: by 10.28.65.196 with SMTP id o187mr11588582wma.115.1479324379202; Wed, 16 Nov 2016 11:26:19 -0800 (PST) Received: from bigtime.twiddle.net ([87.111.149.139]) by smtp.gmail.com with ESMTPSA id 197sm686930wmy.16.2016.11.16.11.26.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Nov 2016 11:26:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 16 Nov 2016 20:25:30 +0100 Message-Id: <1479324335-2074-21-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479324335-2074-1-git-send-email-rth@twiddle.net> References: <1479324335-2074-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH 20/25] tcg/mips: Handle clz opcode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Cc: Aurelien Jarno Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.h | 4 ++-- tcg/mips/tcg-target.inc.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h index f133684..0526018 100644 --- a/tcg/mips/tcg-target.h +++ b/tcg/mips/tcg-target.h @@ -109,8 +109,6 @@ extern bool use_mips32r2_instructions; #define TCG_TARGET_HAS_rem_i32 1 #define TCG_TARGET_HAS_not_i32 1 #define TCG_TARGET_HAS_nor_i32 1 -#define TCG_TARGET_HAS_clz_i32 0 -#define TCG_TARGET_HAS_ctz_i32 0 #define TCG_TARGET_HAS_andc_i32 0 #define TCG_TARGET_HAS_orc_i32 0 #define TCG_TARGET_HAS_eqv_i32 0 @@ -130,6 +128,8 @@ extern bool use_mips32r2_instructions; #define TCG_TARGET_HAS_ext8s_i32 use_mips32r2_instructions #define TCG_TARGET_HAS_ext16s_i32 use_mips32r2_instructions #define TCG_TARGET_HAS_rot_i32 use_mips32r2_instructions +#define TCG_TARGET_HAS_clz_i32 use_mips32r2_instructions +#define TCG_TARGET_HAS_ctz_i32 0 /* optional instructions automatically implemented */ #define TCG_TARGET_HAS_neg_i32 0 /* sub rd, zero, rt */ diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c index 1ecae08..6196d59 100644 --- a/tcg/mips/tcg-target.inc.c +++ b/tcg/mips/tcg-target.inc.c @@ -160,6 +160,7 @@ static void patch_reloc(tcg_insn_unit *code_ptr, int type, #define TCG_CT_CONST_S16 0x400 /* Signed 16-bit: -32768 - 32767 */ #define TCG_CT_CONST_P2M1 0x800 /* Power of 2 minus 1. */ #define TCG_CT_CONST_N16 0x1000 /* "Negatable" 16-bit: -32767 - 32767 */ +#define TCG_CT_CONST_WSZ 0x2000 /* word size */ static inline bool is_p2m1(tcg_target_long val) { @@ -217,6 +218,9 @@ static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) case 'N': ct->ct |= TCG_CT_CONST_N16; break; + case 'W': + ct->ct |= TCG_CT_CONST_WSZ; + break; case 'Z': /* We are cheating a bit here, using the fact that the register ZERO is also the register number 0. Hence there is no need @@ -250,6 +254,8 @@ static inline int tcg_target_const_match(tcg_target_long val, TCGType type, } else if ((ct & TCG_CT_CONST_P2M1) && use_mips32r2_instructions && is_p2m1(val)) { return 1; + } else if ((ct & TCG_CT_CONST_WSZ) && val == 32) { + return 1; } return 0; } @@ -317,6 +323,7 @@ typedef enum { OPC_SLTU = OPC_SPECIAL | 0x2B, OPC_SELEQZ = OPC_SPECIAL | 0x35, OPC_SELNEZ = OPC_SPECIAL | 0x37, + OPC_CLZ_R6 = OPC_SPECIAL | 0120, OPC_REGIMM = 0x01 << 26, OPC_BLTZ = OPC_REGIMM | (0x00 << 16), @@ -324,6 +331,7 @@ typedef enum { OPC_SPECIAL2 = 0x1c << 26, OPC_MUL_R5 = OPC_SPECIAL2 | 0x002, + OPC_CLZ = OPC_SPECIAL2 | 040, OPC_SPECIAL3 = 0x1f << 26, OPC_EXT = OPC_SPECIAL3 | 0x000, @@ -1629,6 +1637,31 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, } break; + case INDEX_op_clz_i32: + if (use_mips32r6_instructions) { + if (a2 == 32) { + tcg_out_opc_reg(s, OPC_CLZ_R6, a0, a1, 0); + } else { + tcg_out_opc_reg(s, OPC_CLZ_R6, TCG_TMP0, a1, 0); + tcg_out_movcond(s, TCG_COND_EQ, a0, a1, 0, a2, TCG_TMP0); + } + } else { + if (a2 == 32) { + tcg_out_opc_reg(s, OPC_CLZ, a0, a1, a1); + } else if (a0 == a2) { + tcg_out_opc_reg(s, OPC_CLZ, TCG_TMP0, a1, a1); + tcg_out_opc_reg(s, OPC_MOVN, a0, TCG_TMP0, a1); + } else if (a0 != a1) { + tcg_out_opc_reg(s, OPC_CLZ, a0, a1, a1); + tcg_out_opc_reg(s, OPC_MOVZ, a0, a2, a1); + } else { + tcg_out_opc_reg(s, OPC_CLZ, TCG_TMP0, a1, a1); + tcg_out_opc_reg(s, OPC_MOVZ, TCG_TMP0, a2, a1); + tcg_out_mov(s, TCG_TYPE_REG, a0, TCG_TMP0); + } + } + break; + case INDEX_op_bswap32_i32: tcg_out_opc_reg(s, OPC_WSBH, a0, 0, a1); tcg_out_opc_sa(s, OPC_ROTR, a0, a0, 16); @@ -1731,6 +1764,7 @@ static const TCGTargetOpDef mips_op_defs[] = { { INDEX_op_sar_i32, { "r", "rZ", "ri" } }, { INDEX_op_rotr_i32, { "r", "rZ", "ri" } }, { INDEX_op_rotl_i32, { "r", "rZ", "ri" } }, + { INDEX_op_clz_i32, { "r", "r", "rWZ" } }, { INDEX_op_bswap16_i32, { "r", "r" } }, { INDEX_op_bswap32_i32, { "r", "r" } },