From patchwork Wed Feb 28 19:31:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 130060 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp135349lja; Wed, 28 Feb 2018 11:40:44 -0800 (PST) X-Google-Smtp-Source: AG47ELuSrIco2kWPoTMadcw1FRoa96uX+UaFD3AY6pa+f3hfsu84n9uelhXU+t5+k6+SyUm/NrSb X-Received: by 2002:a25:7649:: with SMTP id r70-v6mr12757123ybc.342.1519846844503; Wed, 28 Feb 2018 11:40:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519846844; cv=none; d=google.com; s=arc-20160816; b=SF46Bwr8aGcOi31Y3S6ZYgls70wYW8i1b6nHtDn/4FyUoTTgXD10PTJo+hZa19R+ZN xoDMfCdwuJc7FNziQPW3jyLFjLMrmzoipsvWkxEnmabMUjDTSc1AyFToEHjGp5kv5bL+ xisEZQnNOLAEfyja2smDMO3TlqQSq+FLEvbS8PJynUOyQDjtx+1Lg4a1qz4M5GpQxB0Z MbCexVja32C9PgDwAwp7S1FgN2hhKkslqC8/NFl1haPFXs4Y7xm578kpc7C/At1mRl8b 6e3U9VKdXcJ1JK6reLC5gf28KRxmnjImBYzQSQL8AwBz8PCU8v1OVfkvMKIRCkNuHw6b eG9A== 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:arc-authentication-results; bh=qFjrf0fj3fYEerkSuVByoHWTY8OEKjQxncc02aLcsbE=; b=qHyiCm231+Y8zu1+Z+gu++5tGozC9gP7Eww9CYLy32qYhgkoNiA/BObF3jvCFOKIRP lmycNmk8bBOfxFS04ZyOFTFbwk1+/Qsw9LxBMbmyo1RMITNGRXJUimmW7fV4jxKpACD9 L20yQbjuXN6M/jvgPmjCwvf7pIDp+rl59m90kQofYmWb+uaiESkE7/ZmYCs9SLseZCyX 5PWPLrDcIR857twXhdOXuHfImr2sSo1zkeX+dyWdJbbYtXYUVNdA2kFo60UbhSbBktCP qOtlSCEYDnr4tHTbvPCLghrK55Q1ypuzA4gigELE/iiKWaEVoz3novx+NlONcGQHP51B OpNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=e7yJ5CRH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x4-v6si376511ybe.320.2018.02.28.11.40.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 28 Feb 2018 11:40:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=e7yJ5CRH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:46458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er7al-0001qR-Qx for patch@linaro.org; Wed, 28 Feb 2018 14:40:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1er7S1-0003Np-Ua for qemu-devel@nongnu.org; Wed, 28 Feb 2018 14:31:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1er7Rz-0006Ku-7S for qemu-devel@nongnu.org; Wed, 28 Feb 2018 14:31:41 -0500 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:45712) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1er7Rz-0006KS-0E for qemu-devel@nongnu.org; Wed, 28 Feb 2018 14:31:39 -0500 Received: by mail-pl0-x242.google.com with SMTP id v9-v6so2109485plp.12 for ; Wed, 28 Feb 2018 11:31:38 -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=qFjrf0fj3fYEerkSuVByoHWTY8OEKjQxncc02aLcsbE=; b=e7yJ5CRHGkn6VssS+eif8PDIyQxkRrTM+2BI1ml4gReneX8thFBZf5H4bbMcmuyj0K TuJcF/PdgRLsfn9mKpwRDWu0pkVLYduQmr1dshEAnuhSBzyihhbFQXtY65VJvH9IwHNd VRMA9rqqpZ1R/xgxYO92Ss81Hupzpd7Ch4ciw= 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=qFjrf0fj3fYEerkSuVByoHWTY8OEKjQxncc02aLcsbE=; b=M1H8O7exr1/2+iXj/Y/2MZCp6r7+DEbEwEAiQHxIBEiwgUIWnIusDhWip+yi6AWWE1 XTQRPo43HLCzosiABG8lzuvF692nAeUvtoAnsvAOyedax6KwzHsDQ57ByoGUVk+qzJuz RktTil2JbeMXYgneVHgJoQc1WwaWIgTTWgIy7BY9f/FomQFYtpLvdD+IOnPUOPueLWyX mUNP+TsY0jWP3Md18i6kRXlj+qCVBAHzJIeJzG25XfEXDyAU8X1TVvZGKq78nklB7fWy ckFFdcPaDLC2FwtYZvCon4GbmMw0mNYsl2kovCL5UWw99271h8PJZl64GpdWuA5fUwY/ PJvQ== X-Gm-Message-State: APf1xPAe1tebM9G20YfUIZaDLNCy73POrKgjXEzN0T0KBDr+/ZI7XRWF shj07hduJb0rWaS1YeHD9bF8JI+becs= X-Received: by 2002:a17:902:5327:: with SMTP id b36-v6mr6126877pli.332.1519846297714; Wed, 28 Feb 2018 11:31:37 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-169-147.tukw.qwest.net. [97.113.169.147]) by smtp.gmail.com with ESMTPSA id k185sm4200212pgk.94.2018.02.28.11.31.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2018 11:31:36 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Feb 2018 11:31:16 -0800 Message-Id: <20180228193125.20577-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180228193125.20577-1-richard.henderson@linaro.org> References: <20180228193125.20577-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH v3 07/16] target/arm: Decode aa32 armv8.1 three same 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: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/translate.c | 86 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 19 deletions(-) -- 2.14.3 diff --git a/target/arm/translate.c b/target/arm/translate.c index aa6dcaa577..05fa6a53f9 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -25,6 +25,7 @@ #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg-op.h" +#include "tcg-op-gvec.h" #include "qemu/log.h" #include "qemu/bitops.h" #include "arm_ldst.h" @@ -5374,9 +5375,9 @@ static void gen_neon_narrow_op(int op, int u, int size, #define NEON_3R_VPMAX 20 #define NEON_3R_VPMIN 21 #define NEON_3R_VQDMULH_VQRDMULH 22 -#define NEON_3R_VPADD 23 +#define NEON_3R_VPADD_VQRDMLAH 23 #define NEON_3R_SHA 24 /* SHA1C,SHA1P,SHA1M,SHA1SU0,SHA256H{2},SHA256SU1 */ -#define NEON_3R_VFM 25 /* VFMA, VFMS : float fused multiply-add */ +#define NEON_3R_VFM_VQRDMLSH 25 /* VFMA, VFMS, VQRDMLSH */ #define NEON_3R_FLOAT_ARITH 26 /* float VADD, VSUB, VPADD, VABD */ #define NEON_3R_FLOAT_MULTIPLY 27 /* float VMLA, VMLS, VMUL */ #define NEON_3R_FLOAT_CMP 28 /* float VCEQ, VCGE, VCGT */ @@ -5408,9 +5409,9 @@ static const uint8_t neon_3r_sizes[] = { [NEON_3R_VPMAX] = 0x7, [NEON_3R_VPMIN] = 0x7, [NEON_3R_VQDMULH_VQRDMULH] = 0x6, - [NEON_3R_VPADD] = 0x7, + [NEON_3R_VPADD_VQRDMLAH] = 0x7, [NEON_3R_SHA] = 0xf, /* size field encodes op type */ - [NEON_3R_VFM] = 0x5, /* size bit 1 encodes op */ + [NEON_3R_VFM_VQRDMLSH] = 0x7, /* For VFM, size bit 1 encodes op */ [NEON_3R_FLOAT_ARITH] = 0x5, /* size bit 1 encodes op */ [NEON_3R_FLOAT_MULTIPLY] = 0x5, /* size bit 1 encodes op */ [NEON_3R_FLOAT_CMP] = 0x5, /* size bit 1 encodes op */ @@ -5589,6 +5590,22 @@ static const uint8_t neon_2rm_sizes[] = { [NEON_2RM_VCVT_UF] = 0x4, }; + +/* Expand v8.1 simd helper. */ +static int do_v81_helper(DisasContext *s, gen_helper_gvec_3_ptr *fn, + int q, int rd, int rn, int rm) +{ + if (arm_dc_feature(s, ARM_FEATURE_V8_RDM)) { + int opr_sz = (1 + q) * 8; + tcg_gen_gvec_3_ptr(vfp_reg_offset(1, rd), + vfp_reg_offset(1, rn), + vfp_reg_offset(1, rm), cpu_env, + opr_sz, opr_sz, 0, fn); + return 0; + } + return 1; +} + /* Translate a NEON data processing instruction. Return nonzero if the instruction is invalid. We process data in a mixture of 32-bit and 64-bit chunks. @@ -5641,12 +5658,13 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) if (q && ((rd | rn | rm) & 1)) { return 1; } - /* - * The SHA-1/SHA-256 3-register instructions require special treatment - * here, as their size field is overloaded as an op type selector, and - * they all consume their input in a single pass. - */ - if (op == NEON_3R_SHA) { + switch (op) { + case NEON_3R_SHA: + /* The SHA-1/SHA-256 3-register instructions require special + * treatment here, as their size field is overloaded as an + * op type selector, and they all consume their input in a + * single pass. + */ if (!q) { return 1; } @@ -5683,6 +5701,40 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) tcg_temp_free_ptr(ptr2); tcg_temp_free_ptr(ptr3); return 0; + + case NEON_3R_VPADD_VQRDMLAH: + if (!u) { + break; /* VPADD */ + } + /* VQRDMLAH */ + switch (size) { + case 1: + return do_v81_helper(s, gen_helper_gvec_qrdmlah_s16, + q, rd, rn, rm); + case 2: + return do_v81_helper(s, gen_helper_gvec_qrdmlah_s32, + q, rd, rn, rm); + } + return 1; + + case NEON_3R_VFM_VQRDMLSH: + if (!u) { + /* VFM, VFMS */ + if (size == 1) { + return 1; + } + break; + } + /* VQRDMLSH */ + switch (size) { + case 1: + return do_v81_helper(s, gen_helper_gvec_qrdmlsh_s16, + q, rd, rn, rm); + case 2: + return do_v81_helper(s, gen_helper_gvec_qrdmlsh_s32, + q, rd, rn, rm); + } + return 1; } if (size == 3 && op != NEON_3R_LOGIC) { /* 64-bit element instructions. */ @@ -5768,11 +5820,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) rm = rtmp; } break; - case NEON_3R_VPADD: - if (u) { - return 1; - } - /* Fall through */ + case NEON_3R_VPADD_VQRDMLAH: case NEON_3R_VPMAX: case NEON_3R_VPMIN: pairwise = 1; @@ -5806,8 +5854,8 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) return 1; } break; - case NEON_3R_VFM: - if (!arm_dc_feature(s, ARM_FEATURE_VFP4) || u) { + case NEON_3R_VFM_VQRDMLSH: + if (!arm_dc_feature(s, ARM_FEATURE_VFP4)) { return 1; } break; @@ -6004,7 +6052,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) } } break; - case NEON_3R_VPADD: + case NEON_3R_VPADD_VQRDMLAH: switch (size) { case 0: gen_helper_neon_padd_u8(tmp, tmp, tmp2); break; case 1: gen_helper_neon_padd_u16(tmp, tmp, tmp2); break; @@ -6103,7 +6151,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) } } break; - case NEON_3R_VFM: + case NEON_3R_VFM_VQRDMLSH: { /* VFMA, VFMS: fused multiply-add */ TCGv_ptr fpstatus = get_fpstatus_ptr(1);