From patchwork Tue Mar 19 17:21:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160601 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4140553jad; Tue, 19 Mar 2019 10:28:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqxfRZde4ia+L9BrSCV43xRf5boUXLdPD/wQFImpIf0tBXMEg9I+8neFPfY3N8GSVizzzLXv X-Received: by 2002:a5d:400c:: with SMTP id n12mr4390424wrp.31.1553016524767; Tue, 19 Mar 2019 10:28:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553016524; cv=none; d=google.com; s=arc-20160816; b=Y0rOxCBwwotUYiSseX9EDC1rDSXZnxuwrhJ10wf10gdha+vzksvEsLi2mmJgYMOxDJ ReySy0WBQ5LJSAlVvCY0yH2VxQYmAT4V2d1cdXpPSiYltaMNIAMOLeWKFfuDA2uLFI7P Kby/xp9w5Fopo729aktFr4M7VJVuM36UKPuVukoDkWRLgtVAeywD9xiqlqLSqncZOOrC cqBQkdeJmcyE3/wY7OPOImYMBycA1UNIhimP2O4o/I//zdFBSQ6ZTVW9pNF9MoesQx5w DRa2ggIuKGqIlsbLb2ebHnVfUjRzAj6fl89wfZXVhkB+WYQi9V2xgKHcsyX+E+2IbiCi fnXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=7HN9lFxKcXUhGyOG3RVNLhXp/Rku+fRRHbhqaBGioDo=; b=thJciiirMa18pubtJ93PB9D066P3SbzKZ4l1NvsFKIpCV4/bO88LLRsUQbdUedmCnv 9Cq2nyes3BEBJzwWZ/XhXr+2GMncb7DYBEhMy1M1wsEaCleE+lu0QdETBv/9suA/Ks1O BhOihaHe3peUN+ffOtU25iMQJDppJg+u0OsvAhb0BOvjomnaFoANTRcsGBAcbqdX2WLA tbmO1dAs9j+7IB7eeRMow5E2ti9PPh6lJ5LIGD8fDjnv1BN9pTwpBOguR4cQuqUgJstB 9Gl5NFU4XJCAAmk4YLrbpsu1KguXNhYUKPld35S4VWjFDBk62YehAdaX/FCb0DhIhyS8 WwqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UTckg0q4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u11si9661424wri.375.2019.03.19.10.28.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Mar 2019 10:28:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UTckg0q4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:60750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6IXb-0001PF-Mj for patch@linaro.org; Tue, 19 Mar 2019 13:28:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6IQr-0004gK-D8 for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:21:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6IQp-0004Zn-RY for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:21:45 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:34411) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h6IQp-0004Z8-DH for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:21:43 -0400 Received: by mail-pg1-x543.google.com with SMTP id v12so14345656pgq.1 for ; Tue, 19 Mar 2019 10:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7HN9lFxKcXUhGyOG3RVNLhXp/Rku+fRRHbhqaBGioDo=; b=UTckg0q44s3F55jTIjQRtuQR4WHjYMfMnxke6Lg3KJoXyiK6YDwJhuJKeaT8J3BYFK 21r/MPUtKPjJSf3iy1IcUgGXmDTXSg7fYMAFlfGTlj0c++PMOiuYL1o82JuBCNmak1hB NDZX/YpA//cbNw/2RxypK0nZ8s8lIFs1M/GCz+8GbFjq3z4mkl9CT7Tu+FejgzAuk+Op da2wZ98ZdB/+YdDsMxHCn+zJ7Jgbt38KSy8//IC3Hjjb1OPqqyq1wOBpDLDCndKgy6Y1 RL/5vIaUrbjDOYr38xwAMzuQ7usTB103WgSMqlG9o3JyoY7TWcJw+e5G2HILfivJPHuS 79Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7HN9lFxKcXUhGyOG3RVNLhXp/Rku+fRRHbhqaBGioDo=; b=Jtuc+1+gnevRaobCsQ93Xj6mWr7to16sfCrsykp8FwmhiFMdOcSuxfHifVazVlMLlV /sdu6eE7/FBJYNgZE8tnqyy83JNl5syrlFJIGfJVgwFxuUkatCR9t7V2YRiLVXmupY2Q gEq3wYFsSxRmXaRGVhKeMmKhZtINBC0rFmGu5PPehLhks9VbIPMHhW0LfX4wvdFh+g+y T7aHNIpXqAcTInImNIjdgC/4z6xKoUWqutFoTA9B7Eu4fboKCCUpvZC6FHqNg6dZasZv FTz0jUtTOxrGshFv3qjrMy+fkOatAbrI/UUIown32E7aKPac8z6BTM+1hVAS65oDkWSW wH7g== X-Gm-Message-State: APjAAAVA4w0dHfSM2T0RZIk3TWMhWf4gQSZNVqFhy97bgCkdRcbpG6FG K4aqn9pDXnJ6cz1ZwUJPAuN2TKcD7bY= X-Received: by 2002:aa7:90c7:: with SMTP id k7mr2989287pfk.186.1553016102117; Tue, 19 Mar 2019 10:21:42 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id w68sm5616666pfb.176.2019.03.19.10.21.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Mar 2019 10:21:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Mar 2019 10:21:18 -0700 Message-Id: <20190319172126.7502-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190319172126.7502-1-richard.henderson@linaro.org> References: <20190319172126.7502-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH for-4.1 v3 09/17] tcg/i386: Implement tcg_out_dupm_vec 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: mark.cave-ayland@ilande.co.uk, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" At the same time, improve tcg_out_dupi_vec wrt broadcast from the constant pool. Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.inc.c | 57 +++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 14 deletions(-) -- 2.17.2 diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index ae88df440a..2b88f2054e 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc.c @@ -358,7 +358,6 @@ static inline int tcg_target_const_match(tcg_target_long val, TCGType type, #define OPC_MOVBE_MyGy (0xf1 | P_EXT38) #define OPC_MOVD_VyEy (0x6e | P_EXT | P_DATA16) #define OPC_MOVD_EyVy (0x7e | P_EXT | P_DATA16) -#define OPC_MOVDDUP (0x12 | P_EXT | P_SIMDF2) #define OPC_MOVDQA_VxWx (0x6f | P_EXT | P_DATA16) #define OPC_MOVDQA_WxVx (0x7f | P_EXT | P_DATA16) #define OPC_MOVDQU_VxWx (0x6f | P_EXT | P_SIMDF3) @@ -457,6 +456,10 @@ static inline int tcg_target_const_match(tcg_target_long val, TCGType type, #define OPC_UD2 (0x0b | P_EXT) #define OPC_VPBLENDD (0x02 | P_EXT3A | P_DATA16) #define OPC_VPBLENDVB (0x4c | P_EXT3A | P_DATA16) +#define OPC_VPINSRB (0x20 | P_EXT3A | P_DATA16) +#define OPC_VPINSRW (0xc4 | P_EXT | P_DATA16) +#define OPC_VBROADCASTSS (0x18 | P_EXT38 | P_DATA16) +#define OPC_VBROADCASTSD (0x19 | P_EXT38 | P_DATA16) #define OPC_VPBROADCASTB (0x78 | P_EXT38 | P_DATA16) #define OPC_VPBROADCASTW (0x79 | P_EXT38 | P_DATA16) #define OPC_VPBROADCASTD (0x58 | P_EXT38 | P_DATA16) @@ -854,16 +857,17 @@ static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg) return true; } +static const int avx2_dup_insn[4] = { + OPC_VPBROADCASTB, OPC_VPBROADCASTW, + OPC_VPBROADCASTD, OPC_VPBROADCASTQ, +}; + static bool tcg_out_dup_vec(TCGContext *s, TCGType type, unsigned vece, TCGReg r, TCGReg a) { if (have_avx2) { - static const int dup_insn[4] = { - OPC_VPBROADCASTB, OPC_VPBROADCASTW, - OPC_VPBROADCASTD, OPC_VPBROADCASTQ, - }; int vex_l = (type == TCG_TYPE_V256 ? P_VEXL : 0); - tcg_out_vex_modrm(s, dup_insn[vece] + vex_l, r, 0, a); + tcg_out_vex_modrm(s, avx2_dup_insn[vece] + vex_l, r, 0, a); } else { switch (vece) { case MO_8: @@ -893,10 +897,35 @@ static bool tcg_out_dup_vec(TCGContext *s, TCGType type, unsigned vece, static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece, TCGReg r, TCGReg base, intptr_t offset) { - return false; + if (have_avx2) { + int vex_l = (type == TCG_TYPE_V256 ? P_VEXL : 0); + tcg_out_vex_modrm_offset(s, avx2_dup_insn[vece] + vex_l, + r, 0, base, offset); + } else { + switch (vece) { + case MO_64: + tcg_out_vex_modrm_offset(s, OPC_VBROADCASTSD, r, 0, base, offset); + break; + case MO_32: + tcg_out_vex_modrm_offset(s, OPC_VBROADCASTSS, r, 0, base, offset); + break; + case MO_16: + tcg_out_vex_modrm_offset(s, OPC_VPINSRW, r, r, base, offset); + tcg_out8(s, 0); /* imm8 */ + tcg_out_dup_vec(s, type, vece, r, r); + break; + case MO_8: + tcg_out_vex_modrm_offset(s, OPC_VPINSRB, r, r, base, offset); + tcg_out8(s, 0); /* imm8 */ + tcg_out_dup_vec(s, type, vece, r, r); + break; + default: + g_assert_not_reached(); + } + } + return true; } - static void tcg_out_dupi_vec(TCGContext *s, TCGType type, TCGReg ret, tcg_target_long arg) { @@ -917,16 +946,16 @@ static void tcg_out_dupi_vec(TCGContext *s, TCGType type, } else if (have_avx2) { tcg_out_vex_modrm_pool(s, OPC_VPBROADCASTQ + vex_l, ret); } else { - tcg_out_vex_modrm_pool(s, OPC_MOVDDUP, ret); + tcg_out_vex_modrm_pool(s, OPC_VBROADCASTSD, ret); } new_pool_label(s, arg, R_386_PC32, s->code_ptr - 4, -4); - } else if (have_avx2) { - tcg_out_vex_modrm_pool(s, OPC_VPBROADCASTD + vex_l, ret); - new_pool_label(s, arg, R_386_32, s->code_ptr - 4, 0); } else { - tcg_out_vex_modrm_pool(s, OPC_MOVD_VyEy, ret); + if (have_avx2) { + tcg_out_vex_modrm_pool(s, OPC_VBROADCASTSD + vex_l, ret); + } else { + tcg_out_vex_modrm_pool(s, OPC_VBROADCASTSS, ret); + } new_pool_label(s, arg, R_386_32, s->code_ptr - 4, 0); - tcg_out_dup_vec(s, type, MO_32, ret, ret); } }