From patchwork Tue May 14 00:05:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 164072 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1967942ili; Mon, 13 May 2019 17:08:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqwYKu4GXZYieUIEBZcJ47a5UW60ff0e+tIH6S7S0uMs/hL8Uvw35ygwjqRWXbwO1j85bAuO X-Received: by 2002:a50:89ea:: with SMTP id h39mr22350465edh.10.1557792481159; Mon, 13 May 2019 17:08:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557792481; cv=none; d=google.com; s=arc-20160816; b=c8Bj2O4WQSOBLN8+NeVAzRVbigvZdsebiq9aX6MqeJTka3FE3ji+qpABl1cRghiIQ5 kytHM9pfWKAmM86wIsqTIJAM9lPKFYt8cWESfPvHItrtJfVFAOckFINazgBJrg6hN2Ef e5B2DYHywpJGz61hBeByyzFpeS/QMeq/F99BYU0xiRvkx/50v2ZeOTWZb4WnwpzHKfGr NlSeBi0MoWsYpy8K3IW7mOhIAJk4+W4AAv9L5Sy64zbCy3nm8Yr302zcGb31k6q1Rxg4 11DK52cN2WY6TmQehAC1y/k8hzQCPCbVz5H1idBoYcKyMw9GcGLNbUnsZ1YArmgB34go EKOw== 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=4qREfMgDOvDIZnxD8mHxrlGbKtAgS56ZNj2GB4ImDXs=; b=yhOCCXgWLMRIN41ogFFHR37/9/Xgy/VziiQw2vPQhQ1S/u+HOcIOk2Xop9K1VS9rQ5 3WW9uD+bqbqGkIINF1RhsjhFTfZQl31MkgvoPs9rDSAEST0fJZFJhzwhK6KcsJNz+6tr UDCN4iy8OXLSWFuXMz4YcigsEYfS8SeirGqiUVJ2vwgyg4GoyTv2JSDuPu3jAXVeVX+o 9bIEhG1Ad6bptGULVogNWcUw+LFWk2742OERbCU6XKRhwbuFVUV6hoDYzt69owyHSC6i 4GXQ/NwGXk/Mbo42snKqhMJMpjhvguUp1afzP1WAPWpMK4/unhByOwpuS71nZCRgTh+A w3dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VsbJxcyK; 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 o48si4127929edc.92.2019.05.13.17.08.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 13 May 2019 17:08:01 -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=VsbJxcyK; 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]:36593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQKzA-0001m7-1q for patch@linaro.org; Mon, 13 May 2019 20:08:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQKy9-0001dC-2O for qemu-devel@nongnu.org; Mon, 13 May 2019 20:07:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQKxJ-0003Jf-Fg for qemu-devel@nongnu.org; Mon, 13 May 2019 20:06:55 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:42687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hQKxJ-0003CA-0N for qemu-devel@nongnu.org; Mon, 13 May 2019 20:06:05 -0400 Received: by mail-pf1-x430.google.com with SMTP id 13so8063103pfw.9 for ; Mon, 13 May 2019 17:06:00 -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=4qREfMgDOvDIZnxD8mHxrlGbKtAgS56ZNj2GB4ImDXs=; b=VsbJxcyKmRyLl+PMeAvEhUPlSvDfB1Vflk6p0VJD9jxHAY+PWtzH9+/si5XvfI6vWI pwnMO2wY8weJ/Ov+lppwE2cp5PfIo1dR6IH1KImgmq6BFyzu+qN5Z7Uvgl5uWjkCtiyi 9dlJuAkrQRQwOZ9innjFLprn/XHgH0dhp3asvpaztEQXTKVNhpbItWmCc6ss9Hun6M7z pno5le59nwuDZDEmmGH45oCR0keVSza5JIi1AG/lXus48ZJgX6VsM3JOT3zaBFVX5p7M UUBYefKH47+j32PVdNEJx8JIXviD9ylMwlEYNES6y6mAwE6tpthsdVHS9hhH5d1ABNZ2 zPmw== 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=4qREfMgDOvDIZnxD8mHxrlGbKtAgS56ZNj2GB4ImDXs=; b=I8CQwGSwBXF0t/liE85FxzdS1kcUthe2LX4gnnzXXlPC7xwYeaKsozdcOsTzNbih2s jWriBNWCPeDf/uWmetCxehpIkJke4MgvE1kWyInp7iomhyYwG+86p2supDzNBSCkg1B1 YjPGDtIaj/zcDMLA0145V9yNGlJaTNPcycXl/PIC/CWdrajVkBgx0o7nlLeSr0vez8x6 fsbnAkgKhWDP76z5B1qN4qJhsdYdBe72Q3Ubf6o0EtqcjkPHrVY/sKxv2nMVpav4t9oR G+Jk/QOfBv7bf9aho3vyUGDVXBX0d877fD+LZfz732OF4AHzoIQHWFvGnxCMsXmDvxYl 5JzQ== X-Gm-Message-State: APjAAAUgh+HsPanW4a1B/I+3koebbmyo9VAPqp1DDgrFvI6xfO9lWfqR QV5gvU7CafGvDOLrUuSSvoTCmB0OHXE= X-Received: by 2002:a63:1e5b:: with SMTP id p27mr33871719pgm.213.1557792359244; Mon, 13 May 2019 17:05:59 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id u3sm238151pfn.29.2019.05.13.17.05.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 17:05:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 13 May 2019 17:05:21 -0700 Message-Id: <20190514000540.4313-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190514000540.4313-1-richard.henderson@linaro.org> References: <20190514000540.4313-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::430 Subject: [Qemu-devel] [PULL 12/31] 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: peter.maydell@linux.org 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.1 diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index f04933bc19..f4bd00e24f 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) @@ -458,6 +457,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) @@ -855,16 +858,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: @@ -894,10 +898,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) { @@ -918,16 +947,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); } }