From patchwork Mon Jan 28 15:58:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 156765 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3591176jaa; Mon, 28 Jan 2019 08:03:41 -0800 (PST) X-Google-Smtp-Source: ALg8bN7vsa0ZpapxaiWSoJhR9oJrXielpPCcgcZxUEc22DoSw4NsrKismNj5eStNISfr0aEG+Rrs X-Received: by 2002:a1c:a00f:: with SMTP id j15mr16941171wme.84.1548691421482; Mon, 28 Jan 2019 08:03:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548691421; cv=none; d=google.com; s=arc-20160816; b=vgKKtByCrIL6GL8GdS1DxwiKU3tyW72K9gjOBH3J00kp6SV30azYlxAmdSUpaxW2lL SuKL4dUeO21H3GQONNxJFd87x7A81z1fhlKki7f0FdUG3EbxGZ4Pa+YDG565eKdVhhwk XwluYrUVf2W0WHu/ygaiY9t1TqLs7Q5z+O+NWJ+Rgk9EI/Bw7eToOEX7lzb8/nuIcnkh 9C2Jo86oQIbmk/2TdJZOYspiQP25UnohBvNBtQ26fzmBIbKtoyNc6hYNYZRh4nRJR61j PNXPIibnZubHbCeUxsxAnlVTifUCftXzyBiR47sibkNvhxdTVpNl9D3k5UtMH0R0m3BR 2ziA== 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=E3cZlO8FHbEZnWarBcLjNkcP2FXc/lN8oOBh/1vDfvY=; b=zl18ppmdSbTAuZ5p2DpSKWvzrkzr/m0KTDvID6THXLQ4Iat5Twt/Z3YJU1G0YvaJ8O x14D28xlYDDrwp2awSlz46mQiSsF3kXp6IE8z/ajxzGh/lZs6PJScEC1rM2gcfW2EjYQ LWXrFIVIpmDv22kywS/b9ZvvVYH4itQd1f9JGPITLtWmTrLfGnLlwQZR4EBpcPDaqqlW T+Pazj3rshdLj/HtLSb5xiRB0riR7w96jHOPsPC81ILkZrqqmieOeQtLoW57vHKWTE5F eJmcp8Y/RPjB+NZ9UYZy8xvlXV7oQkAbIVxsG+Sp+kJoYFaH1AKsEqPLTHXIDMWVkDhH svrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WkpNgZm3; 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 t6si80581659wrw.74.2019.01.28.08.03.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 28 Jan 2019 08:03:41 -0800 (PST) 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=WkpNgZm3; 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]:34208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go9Nq-0007xg-CF for patch@linaro.org; Mon, 28 Jan 2019 11:03:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1go9Jl-0004uI-5h for qemu-devel@nongnu.org; Mon, 28 Jan 2019 10:59:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1go9Jk-0007kd-12 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 10:59:25 -0500 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:45045) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1go9Jj-0007k9-SA for qemu-devel@nongnu.org; Mon, 28 Jan 2019 10:59:23 -0500 Received: by mail-pg1-x532.google.com with SMTP id t13so7370214pgr.11 for ; Mon, 28 Jan 2019 07:59:23 -0800 (PST) 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=E3cZlO8FHbEZnWarBcLjNkcP2FXc/lN8oOBh/1vDfvY=; b=WkpNgZm3NuVIMd5QZC29lLKA3LxvKzsXHQKYN8SlU2VpQpm8XN8Yk/Dyi6wR6FZNaZ eTLz/q3zUel13zJwH9f5qrBRQJ0H6dQLDWpdLdIKwdHHFvNJXE2JpYD0JTkSVyjIBfxR BnTObPnS5UlQeINo8NVNohB6+tKVVEyP3bKvk= 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=E3cZlO8FHbEZnWarBcLjNkcP2FXc/lN8oOBh/1vDfvY=; b=IbbKo9GIvhmHRoGaPuO1qHlN5R2MYt5zJnYxWTFFeHiGYTX0BtkmaIL2EQswBE9yRF Y2xrZ3K/EeVHNlGCLynpt6T498xxOxMZSkWHcAeUN3pqaTiTs0SbZO+g+VzZXpt3c5hx /Th3cFqO8MwFIzfjme0ES/0bDh93CORfnL8B2rrZ45hoE8vvfID5px1Fp8FY6wMV8jc1 BSsGNbpGbgWh+P/VfOkZQDpLfmestJEZVEldCI97e8cfoNdpQneVNb35Mt0TEPeTD9Fe ORT/6YKKdxLE5DQ/CrNCkm7XoAsWGMvRe7iQ/PFlsOuKfPH1zmob6i9WoeBazMmL+gFP cGdQ== X-Gm-Message-State: AJcUukcwK/W+BHQ9WdytBD1kILgb4W3cT+sAYacPRYrBW7ePP25kCdvO oqrNUN5zAXA3DCuBW9Anuzu3pyK5nMU= X-Received: by 2002:a63:8ac4:: with SMTP id y187mr20457389pgd.446.1548691162125; Mon, 28 Jan 2019 07:59:22 -0800 (PST) Received: from cloudburst.twiddle.net (50-233-235-3-static.hfc.comcastbusiness.net. [50.233.235.3]) by smtp.gmail.com with ESMTPSA id p2sm45518687pfp.125.2019.01.28.07.59.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Jan 2019 07:59:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 28 Jan 2019 07:58:52 -0800 Message-Id: <20190128155907.20607-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190128155907.20607-1-richard.henderson@linaro.org> References: <20190128155907.20607-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::532 Subject: [Qemu-devel] [PULL 08/23] tcg/i386: Implement vector minmax arithmetic 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@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The avx instruction set does not directly provide MO_64. We can still implement 64-bit with comparison and vpblendvb. Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.h | 2 +- tcg/i386/tcg-target.inc.c | 81 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) -- 2.17.2 diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h index efbd5a6fc9..7995fe3eab 100644 --- a/tcg/i386/tcg-target.h +++ b/tcg/i386/tcg-target.h @@ -186,7 +186,7 @@ extern bool have_avx2; #define TCG_TARGET_HAS_cmp_vec 1 #define TCG_TARGET_HAS_mul_vec 1 #define TCG_TARGET_HAS_sat_vec 1 -#define TCG_TARGET_HAS_minmax_vec 0 +#define TCG_TARGET_HAS_minmax_vec 1 #define TCG_TARGET_deposit_i32_valid(ofs, len) \ (((ofs) == 0 && (len) == 8) || ((ofs) == 8 && (len) == 8) || \ diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index a5791dfaa5..dbf8253718 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc.c @@ -392,6 +392,18 @@ static inline int tcg_target_const_match(tcg_target_long val, TCGType type, #define OPC_PCMPGTW (0x65 | P_EXT | P_DATA16) #define OPC_PCMPGTD (0x66 | P_EXT | P_DATA16) #define OPC_PCMPGTQ (0x37 | P_EXT38 | P_DATA16) +#define OPC_PMAXSB (0x3c | P_EXT38 | P_DATA16) +#define OPC_PMAXSW (0xee | P_EXT | P_DATA16) +#define OPC_PMAXSD (0x3d | P_EXT38 | P_DATA16) +#define OPC_PMAXUB (0xde | P_EXT | P_DATA16) +#define OPC_PMAXUW (0x3e | P_EXT38 | P_DATA16) +#define OPC_PMAXUD (0x3f | P_EXT38 | P_DATA16) +#define OPC_PMINSB (0x38 | P_EXT38 | P_DATA16) +#define OPC_PMINSW (0xea | P_EXT | P_DATA16) +#define OPC_PMINSD (0x39 | P_EXT38 | P_DATA16) +#define OPC_PMINUB (0xda | P_EXT | P_DATA16) +#define OPC_PMINUW (0x3a | P_EXT38 | P_DATA16) +#define OPC_PMINUD (0x3b | P_EXT38 | P_DATA16) #define OPC_PMOVSXBW (0x20 | P_EXT38 | P_DATA16) #define OPC_PMOVSXWD (0x23 | P_EXT38 | P_DATA16) #define OPC_PMOVSXDQ (0x25 | P_EXT38 | P_DATA16) @@ -2638,6 +2650,18 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, static int const packus_insn[4] = { OPC_PACKUSWB, OPC_PACKUSDW, OPC_UD2, OPC_UD2 }; + static int const smin_insn[4] = { + OPC_PMINSB, OPC_PMINSW, OPC_PMINSD, OPC_UD2 + }; + static int const smax_insn[4] = { + OPC_PMAXSB, OPC_PMAXSW, OPC_PMAXSD, OPC_UD2 + }; + static int const umin_insn[4] = { + OPC_PMINUB, OPC_PMINUW, OPC_PMINUD, OPC_UD2 + }; + static int const umax_insn[4] = { + OPC_PMAXUB, OPC_PMAXUW, OPC_PMAXUD, OPC_UD2 + }; TCGType type = vecl + TCG_TYPE_V64; int insn, sub; @@ -2678,6 +2702,18 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, case INDEX_op_xor_vec: insn = OPC_PXOR; goto gen_simd; + case INDEX_op_smin_vec: + insn = smin_insn[vece]; + goto gen_simd; + case INDEX_op_umin_vec: + insn = umin_insn[vece]; + goto gen_simd; + case INDEX_op_smax_vec: + insn = smax_insn[vece]; + goto gen_simd; + case INDEX_op_umax_vec: + insn = umax_insn[vece]; + goto gen_simd; case INDEX_op_x86_punpckl_vec: insn = punpckl_insn[vece]; goto gen_simd; @@ -3043,6 +3079,10 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) case INDEX_op_usadd_vec: case INDEX_op_sssub_vec: case INDEX_op_ussub_vec: + case INDEX_op_smin_vec: + case INDEX_op_umin_vec: + case INDEX_op_smax_vec: + case INDEX_op_umax_vec: case INDEX_op_cmp_vec: case INDEX_op_x86_shufps_vec: case INDEX_op_x86_blend_vec: @@ -3115,6 +3155,11 @@ int tcg_can_emit_vec_op(TCGOpcode opc, TCGType type, unsigned vece) case INDEX_op_sssub_vec: case INDEX_op_ussub_vec: return vece <= MO_16; + case INDEX_op_smin_vec: + case INDEX_op_smax_vec: + case INDEX_op_umin_vec: + case INDEX_op_umax_vec: + return vece <= MO_32 ? 1 : -1; default: return 0; @@ -3343,6 +3388,25 @@ static void expand_vec_cmp(TCGType type, unsigned vece, TCGv_vec v0, } } +static void expand_vec_minmax(TCGType type, unsigned vece, + TCGCond cond, bool min, + TCGv_vec v0, TCGv_vec v1, TCGv_vec v2) +{ + TCGv_vec t1 = tcg_temp_new_vec(type); + + tcg_debug_assert(vece == MO_64); + + tcg_gen_cmp_vec(cond, vece, t1, v1, v2); + if (min) { + TCGv_vec t2; + t2 = v1, v1 = v2, v2 = t2; + } + vec_gen_4(INDEX_op_x86_vpblendvb_vec, type, vece, + tcgv_vec_arg(v0), tcgv_vec_arg(v1), + tcgv_vec_arg(v2), tcgv_vec_arg(t1)); + tcg_temp_free_vec(t1); +} + void tcg_expand_vec_op(TCGOpcode opc, TCGType type, unsigned vece, TCGArg a0, ...) { @@ -3375,6 +3439,23 @@ void tcg_expand_vec_op(TCGOpcode opc, TCGType type, unsigned vece, expand_vec_cmp(type, vece, v0, v1, v2, va_arg(va, TCGArg)); break; + case INDEX_op_smin_vec: + v2 = temp_tcgv_vec(arg_temp(a2)); + expand_vec_minmax(type, vece, TCG_COND_GT, true, v0, v1, v2); + break; + case INDEX_op_smax_vec: + v2 = temp_tcgv_vec(arg_temp(a2)); + expand_vec_minmax(type, vece, TCG_COND_GT, false, v0, v1, v2); + break; + case INDEX_op_umin_vec: + v2 = temp_tcgv_vec(arg_temp(a2)); + expand_vec_minmax(type, vece, TCG_COND_GTU, true, v0, v1, v2); + break; + case INDEX_op_umax_vec: + v2 = temp_tcgv_vec(arg_temp(a2)); + expand_vec_minmax(type, vece, TCG_COND_GTU, false, v0, v1, v2); + break; + default: break; }