From patchwork Fri Feb 15 19:23:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 158538 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1063290jaa; Fri, 15 Feb 2019 11:26:21 -0800 (PST) X-Google-Smtp-Source: AHgI3IZRNtCXU+gO4bzM3cZ3XmQEVYxS6NJ+b2HgFX5yIa4ZGaHRgSGhJ6beVIw8aiUJYLC82uIV X-Received: by 2002:a25:8544:: with SMTP id f4mr9422595ybn.484.1550258781062; Fri, 15 Feb 2019 11:26:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550258781; cv=none; d=google.com; s=arc-20160816; b=bpAd3CmcNJExi33BLVNHcSjtTujuzTNBc+lwwsa9weSEoJcYDsLlOLRWU9dLrLa9+4 JKOyW4imy2TyKd0Xux+axtEAqWIUxxrDqkGAhbDA+uT36AdvRYJfn3PzHf+6KYIv+AWw 8mUFKLZl2Pjz5/LlFrvKHXZP/+vrPwipAQlhCuOzhWqxluOLvu09DCsSnrpiyNHT546m hDQSpeo7MBIp6ZqqL0GYQ9e53eCTy31CfjVDF+Op0fvL23U5nT99DXo8fjf23vcmQ5Gm 5R2E+XpIdRVy00svKEDFmy2mb+Fj4Ouejq9iU1+sw3+1De2N4kAMW32yctqMUobe4053 GqfA== 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=IN48ZCboVTZ5+/mYADGaGur2BX1ffq1za679/1MZfgM=; b=Dswnzf+7D1NAo3z0L3P6WXu7qHG8wjumqZj4KlxFuHSiSUy+XfxhW4ad6otRC9Ddxa DAhdF+Kzaqa9js/hTVWuOxQNFegZpeUBsoywX73RPVSsjCkuzZIfH90+pv4oyP3vonch e5I+JAqetUsVAMFnRnGDZqDg8Xl370dQ42g4P9Pvj4QaAGbQETKAfkHD5JCUrDKPhNXB 4/CzI55Ie2/uGH74rxZAn28s5cOLbb0QnH+qWXQuO7PyYS+3UomMmWRjne1XgveFq6/n Id/yaB1siu4VuGj/Ozvg9hGU2QWwfOi5TZmReywojqXgPbRJnzA3gA3BpxudmtFi+Yia fBjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Wv5SVhOL; 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 134si3557355ybc.79.2019.02.15.11.26.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Feb 2019 11:26:21 -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=Wv5SVhOL; 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]:45046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guj7s-0006eR-G9 for patch@linaro.org; Fri, 15 Feb 2019 14:26:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guj4v-0005Qv-WC for qemu-devel@nongnu.org; Fri, 15 Feb 2019 14:23:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guj4u-0003R3-7t for qemu-devel@nongnu.org; Fri, 15 Feb 2019 14:23:17 -0500 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:44286) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guj4t-0003MS-VO for qemu-devel@nongnu.org; Fri, 15 Feb 2019 14:23:16 -0500 Received: by mail-pf1-x441.google.com with SMTP id u6so5266991pfh.11 for ; Fri, 15 Feb 2019 11:23:15 -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=IN48ZCboVTZ5+/mYADGaGur2BX1ffq1za679/1MZfgM=; b=Wv5SVhOLODmWZvfchEvXDLLat07m7PNRMS6zaCTFuRO5MnpUpG5WMiW0hX3RopRmf1 1BvYSKwToIgeioQ3ucbhjK3N6aH6Z1Lkv5tKOcLcVDnDsbekzymcxgI9kP+dRvsJzZ1R cusuUiayUF1oX3RfwD/qU+FN8NsUbrqmazF3T/IhysKhoPZKEnJ2O2JLrhhaWQVWEMjK paOHozDdN8USXvsJeNDnkNwkr4hW4GB5Iaci+dOVz+qPMTId1P+ddgSX2OLoTOBVvj5A 2qMTINHUQDx59DLACVIHt9HH2nRfgjOqPVtK7a04moaDtaGB7ZpAPE/I/vfIusUmAwRs dsTw== 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=IN48ZCboVTZ5+/mYADGaGur2BX1ffq1za679/1MZfgM=; b=kGbDjJeYT1smreZi9/WKFLSc8rc61ueuKmVWg/SCeiLuw/4oRiQIW9nkwyZA0vyrCi f6Kinu7CnJPPVhvbu94TLiu/ujEbOcUQ1aA4lOYodXHX02RE2scryckgE4AH37d47nUU eJHFPcFWSWIn+c2oTOoaorI9skY5FsZQju1Oh+w2v16Ap1FKwCPBNwFwE+D8JBXmbabs QAO0o5gcuyYo6LnozyrMlFS7W1vgiSAnEBxyDPNXC0RWfeOyddgzKJJWHnkRKf8wTACq hO+p5pWMWLiZFxPaeVwKxptJn2e9ZjeoWYmQ5ACZp99URfQy3nwqWXrdMh8uqvSYW7pU kAjA== X-Gm-Message-State: AHQUAub/QCBF897p7cKVsYexRyNPKRPV9yfnL0EzUlBxMPHl9BRWNRss /JTNZsoReZWve9Pliij2xCx4epn2wts= X-Received: by 2002:a62:4181:: with SMTP id g1mr11260193pfd.45.1550258594611; Fri, 15 Feb 2019 11:23:14 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id o85sm15161596pfi.105.2019.02.15.11.23.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Feb 2019 11:23:13 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 15 Feb 2019 11:23:01 -0800 Message-Id: <20190215192302.27855-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190215192302.27855-1-richard.henderson@linaro.org> References: <20190215192302.27855-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::441 Subject: [Qemu-devel] [PATCH v4 7/8] target/arm: Implement VFMAL and VFMSL for aarch32 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" Signed-off-by: Richard Henderson --- target/arm/cpu.h | 5 ++ target/arm/translate.c | 103 +++++++++++++++++++++++++++++------------ 2 files changed, 79 insertions(+), 29 deletions(-) -- 2.17.2 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 69589573e4..9cf439fb8d 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3283,6 +3283,11 @@ static inline bool isar_feature_aa32_dp(const ARMISARegisters *id) return FIELD_EX32(id->id_isar6, ID_ISAR6, DP) != 0; } +static inline bool isar_feature_aa32_fhm(const ARMISARegisters *id) +{ + return FIELD_EX32(id->id_isar6, ID_ISAR6, FHM) != 0; +} + static inline bool isar_feature_aa32_fp16_arith(const ARMISARegisters *id) { /* diff --git a/target/arm/translate.c b/target/arm/translate.c index c1175798ac..c319ba9aae 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8372,15 +8372,8 @@ static int disas_neon_insn_3same_ext(DisasContext *s, uint32_t insn) gen_helper_gvec_3_ptr *fn_gvec_ptr = NULL; int rd, rn, rm, opr_sz; int data = 0; - bool q; - - q = extract32(insn, 6, 1); - VFP_DREG_D(rd, insn); - VFP_DREG_N(rn, insn); - VFP_DREG_M(rm, insn); - if ((rd | rn | rm) & q) { - return 1; - } + int off_rn, off_rm; + bool is_long = false, q = extract32(insn, 6, 1); if ((insn & 0xfe200f10) == 0xfc200800) { /* VCMLA -- 1111 110R R.1S .... .... 1000 ...0 .... */ @@ -8407,10 +8400,38 @@ static int disas_neon_insn_3same_ext(DisasContext *s, uint32_t insn) return 1; } fn_gvec = u ? gen_helper_gvec_udot_b : gen_helper_gvec_sdot_b; + } else if ((insn & 0xff300f10) == 0xfc200810) { + /* VFM[AS]L -- 1111 1100 S.10 .... .... 1000 .Q.1 .... */ + int is_s = extract32(insn, 23, 1); + if (!dc_isar_feature(aa32_fhm, s)) { + return 1; + } + is_long = true; + fn_gvec_ptr = gen_helper_gvec_fmlal_h; + data = is_s; /* is_2 == 0 */ } else { return 1; } + VFP_DREG_D(rd, insn); + if (rd & q) { + return 1; + } + if (q || !is_long) { + VFP_DREG_N(rn, insn); + VFP_DREG_M(rm, insn); + if ((rn | rm) & q & !is_long) { + return 1; + } + off_rn = vfp_reg_offset(1, rn); + off_rm = vfp_reg_offset(1, rm); + } else { + rn = VFP_SREG_N(insn); + rm = VFP_SREG_M(insn); + off_rn = vfp_reg_offset(0, rn); + off_rm = vfp_reg_offset(0, rm); + } + if (s->fp_excp_el) { gen_exception_insn(s, 4, EXCP_UDEF, syn_simd_access_trap(1, 0xe, false), s->fp_excp_el); @@ -8423,15 +8444,11 @@ static int disas_neon_insn_3same_ext(DisasContext *s, uint32_t insn) opr_sz = (1 + q) * 8; if (fn_gvec_ptr) { TCGv_ptr fpst = get_fpstatus_ptr(1); - tcg_gen_gvec_3_ptr(vfp_reg_offset(1, rd), - vfp_reg_offset(1, rn), - vfp_reg_offset(1, rm), fpst, + tcg_gen_gvec_3_ptr(vfp_reg_offset(1, rd), off_rn, off_rm, fpst, opr_sz, opr_sz, data, fn_gvec_ptr); tcg_temp_free_ptr(fpst); } else { - tcg_gen_gvec_3_ool(vfp_reg_offset(1, rd), - vfp_reg_offset(1, rn), - vfp_reg_offset(1, rm), + tcg_gen_gvec_3_ool(vfp_reg_offset(1, rd), off_rn, off_rm, opr_sz, opr_sz, data, fn_gvec); } return 0; @@ -8450,14 +8467,8 @@ static int disas_neon_insn_2reg_scalar_ext(DisasContext *s, uint32_t insn) gen_helper_gvec_3 *fn_gvec = NULL; gen_helper_gvec_3_ptr *fn_gvec_ptr = NULL; int rd, rn, rm, opr_sz, data; - bool q; - - q = extract32(insn, 6, 1); - VFP_DREG_D(rd, insn); - VFP_DREG_N(rn, insn); - if ((rd | rn) & q) { - return 1; - } + int off_rn, off_rm; + bool is_long = false, q = extract32(insn, 6, 1); if ((insn & 0xff000f10) == 0xfe000800) { /* VCMLA (indexed) -- 1111 1110 S.RR .... .... 1000 ...0 .... */ @@ -8486,6 +8497,7 @@ static int disas_neon_insn_2reg_scalar_ext(DisasContext *s, uint32_t insn) } else if ((insn & 0xffb00f00) == 0xfe200d00) { /* V[US]DOT -- 1111 1110 0.10 .... .... 1101 .Q.U .... */ int u = extract32(insn, 4, 1); + if (!dc_isar_feature(aa32_dp, s)) { return 1; } @@ -8493,10 +8505,47 @@ static int disas_neon_insn_2reg_scalar_ext(DisasContext *s, uint32_t insn) /* rm is just Vm, and index is M. */ data = extract32(insn, 5, 1); /* index */ rm = extract32(insn, 0, 4); + } else if ((insn & 0xffa00f10) == 0xfe000810) { + /* VFM[AS]L -- 1111 1110 0.0S .... .... 1000 .Q.1 .... */ + int is_s = extract32(insn, 20, 1); + int vm20 = extract32(insn, 0, 3); + int vm3 = extract32(insn, 3, 1); + int m = extract32(insn, 5, 1); + int index; + + if (!dc_isar_feature(aa32_fhm, s)) { + return 1; + } + if (q) { + rm = vm20; + index = m * 2 + vm3; + } else { + rm = vm20 * 2 + m; + index = vm3; + } + is_long = true; + data = (index << 2) | is_s; /* is_2 == 0 */ + fn_gvec_ptr = gen_helper_gvec_fmlal_idx_h; } else { return 1; } + VFP_DREG_D(rd, insn); + if (rd & q) { + return 1; + } + if (q || !is_long) { + VFP_DREG_N(rn, insn); + if (rn & q & !is_long) { + return 1; + } + off_rn = vfp_reg_offset(1, rn); + off_rm = vfp_reg_offset(1, rm); + } else { + rn = VFP_SREG_N(insn); + off_rn = vfp_reg_offset(0, rn); + off_rm = vfp_reg_offset(0, rm); + } if (s->fp_excp_el) { gen_exception_insn(s, 4, EXCP_UDEF, syn_simd_access_trap(1, 0xe, false), s->fp_excp_el); @@ -8509,15 +8558,11 @@ static int disas_neon_insn_2reg_scalar_ext(DisasContext *s, uint32_t insn) opr_sz = (1 + q) * 8; if (fn_gvec_ptr) { TCGv_ptr fpst = get_fpstatus_ptr(1); - tcg_gen_gvec_3_ptr(vfp_reg_offset(1, rd), - vfp_reg_offset(1, rn), - vfp_reg_offset(1, rm), fpst, + tcg_gen_gvec_3_ptr(vfp_reg_offset(1, rd), off_rn, off_rm, fpst, opr_sz, opr_sz, data, fn_gvec_ptr); tcg_temp_free_ptr(fpst); } else { - tcg_gen_gvec_3_ool(vfp_reg_offset(1, rd), - vfp_reg_offset(1, rn), - vfp_reg_offset(1, rm), + tcg_gen_gvec_3_ool(vfp_reg_offset(1, rd), off_rn, off_rm, opr_sz, opr_sz, data, fn_gvec); } return 0;