From patchwork Tue Feb 19 22:29:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 158744 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4208395jaa; Tue, 19 Feb 2019 14:30:31 -0800 (PST) X-Google-Smtp-Source: AHgI3IYUrQdGUw6OAnUyXZJNG7YATn3DCizqqKeJ0b82wK1ZVxeO7QdMIJwu7g+xIZgaobwXZuGO X-Received: by 2002:a25:494:: with SMTP id 142mr17621850ybe.201.1550615431547; Tue, 19 Feb 2019 14:30:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550615431; cv=none; d=google.com; s=arc-20160816; b=CKHo24sF3nXhsdKRRvsPclJ3jHW3HFlfvOg3t9GHfobH7MUwWA1jH91TBxEjISO0rw RUb2Dh7XstmHwfbRIHz1Z+TEhJB2JfUAO6QZmlo7rYC00o3zxpfzjHOZu+dz1crkuyYL 1NaTe0gapLOAf7nvKrrJ2qR6oUKmpQdsxZdvizhp/4miyhGAadyKk7tX8tMizrblPoiz OnQjXt84dRaBr41xe5sKDzjLuj9FnexBJX5ssbtKUgk3G1wxk0+RIQE6qFbZLItGH6cQ G9ZR38vTJpsCBdP2qmatTj53RrkL6kzeD3CuStPAgTgsnCgifc8FUU5lWrp8Pk/ihlwR lP1A== 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=fb2qKxg9wL3pyEXErnYYFvchv2HywMiDhW3awzPq/x0=; b=GdDnRW+kj/yTkCzn7T3ttmXPVsKG2shnP521ZniEz8rtw5433LjXGbPkyReBPQiiNI f0mwAjargGW83jj7Pd77ki8d59xDCU5ZS6oPA0K/ErkPJAOWkseX8ukSSs6V9+GXxPrT W4mtQK5+XB8LZTPRSt95/JcIXsFy2u+v5+fX3TuJuVl5AgHQmx3XO3fgVPdNeiwg+dHf KHjSasV/geEx11P5BMi0m9dqQrRPoK6uWNO88y2rkfo/ey84QUgPPUL1ddppTuxwUTmt UEIPiHNF6gKXCvOAfuNnXsEW3F1ekx7oGhB08CgQHiUxV+R2hWDjGO9u9KFugMGzev3A QtSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QELw8aS1; 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 x128si10085129ybc.185.2019.02.19.14.30.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Feb 2019 14:30:31 -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=QELw8aS1; 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]:55889 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwDuJ-0000KQ-14 for patch@linaro.org; Tue, 19 Feb 2019 17:30:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwDtt-0000IX-91 for qemu-devel@nongnu.org; Tue, 19 Feb 2019 17:30:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwDts-0002Uc-09 for qemu-devel@nongnu.org; Tue, 19 Feb 2019 17:30:05 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:44418) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwDtq-0002Sd-Oq for qemu-devel@nongnu.org; Tue, 19 Feb 2019 17:30:02 -0500 Received: by mail-pl1-x62d.google.com with SMTP id c4so6082226pls.11 for ; Tue, 19 Feb 2019 14:30:00 -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=fb2qKxg9wL3pyEXErnYYFvchv2HywMiDhW3awzPq/x0=; b=QELw8aS1zwW5GRo7BWQycshshFJI5swkpUZxo0uxAxYa18bKrq0R2SSjPtjsz5JRFh Exaq/7jKcxiCY+nIfRNyyF7b7qZ5Sv3K9D5HL1mE+w/7vFaEPFNj4KvLRv6sYeE0FTH1 nbbTynuPGAlHDSVjLf+tFug3EQi4kXcvKVBolHnsdvCz2omKqei8scqZcCdIzLwL1dUj irm2sU+VsJs2kZdpd5C4Ct283U5nJjMMw12UUlyDICssRvlIyxCIYAkfpKy0A+V5NXGz PdXoV7cE51dfwsrkAwWUmYtFkOftyi2/Jc41ZY/BzfY92pL3J+4XUG7eGZHu2+4I3IKk tQiA== 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=fb2qKxg9wL3pyEXErnYYFvchv2HywMiDhW3awzPq/x0=; b=HnPFEAkYJWKK41P16AHmBXbGbe8DYeRQBwelZH8ufXel3fmHIsB48qMZ7gS4IEn9kd MF6OwGaW1B8tZNsyviJdwiDlUNCvigGJsSIBTUpb+IeQ3wYgLoHzeXvju8kBDXDga4I6 l5tdxj7v4nhA8QusQV7U/kOrr465ihhp2vzrGyBSLIRQ5ctcPilCY6oGVTDX1LxrXz2m mdRciuBE7L5GxlPYKwQT7zafKpVpclRkIxjEmeIpjpZ1w0r3HIJR3z4Y4luPpMJ0GvL+ nvEazyXTbpaSZKakWWvKyP3zODo0n8B2cKYbSqOtlpORl4REIuYOvL8S/zKMXgSHqe1W gMmg== X-Gm-Message-State: AHQUAuZDFf3P7rijtX9vCmDjzadZU9D3FtFjj3Vfh7C0I4LNjtpwRmpC rRal/fuYlJ7EZ70ucRQbzkB/63jm7wY= X-Received: by 2002:a17:902:e00d:: with SMTP id ca13mr6764152plb.206.1550615399100; Tue, 19 Feb 2019 14:29:59 -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 20sm12530778pfs.182.2019.02.19.14.29.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Feb 2019 14:29:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2019 14:29:50 -0800 Message-Id: <20190219222952.22183-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190219222952.22183-1-richard.henderson@linaro.org> References: <20190219222952.22183-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::62d Subject: [Qemu-devel] [PATCH v5 3/5] 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 | 129 ++++++++++++++++++++++++++++++----------- 2 files changed, 101 insertions(+), 33 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..86ae2b314c 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8372,15 +8372,9 @@ 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); + bool ptr_is_env = false; if ((insn & 0xfe200f10) == 0xfc200800) { /* VCMLA -- 1111 110R R.1S .... .... 1000 ...0 .... */ @@ -8407,10 +8401,39 @@ 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; + data = is_s; /* is_2 == 0 */ + fn_gvec_ptr = gen_helper_gvec_fmlal_a32; + ptr_is_env = true; } 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); @@ -8422,16 +8445,19 @@ 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, + TCGv_ptr ptr; + if (ptr_is_env) { + ptr = cpu_env; + } else { + ptr = get_fpstatus_ptr(1); + } + tcg_gen_gvec_3_ptr(vfp_reg_offset(1, rd), off_rn, off_rm, ptr, opr_sz, opr_sz, data, fn_gvec_ptr); - tcg_temp_free_ptr(fpst); + if (!ptr_is_env) { + tcg_temp_free_ptr(ptr); + } } 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 +8476,9 @@ 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); + bool ptr_is_env = false; if ((insn & 0xff000f10) == 0xfe000800) { /* VCMLA (indexed) -- 1111 1110 S.RR .... .... 1000 ...0 .... */ @@ -8486,6 +8507,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 +8515,48 @@ 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_a32; + ptr_is_env = true; } 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); @@ -8508,16 +8568,19 @@ 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, + TCGv_ptr ptr; + if (ptr_is_env) { + ptr = cpu_env; + } else { + ptr = get_fpstatus_ptr(1); + } + tcg_gen_gvec_3_ptr(vfp_reg_offset(1, rd), off_rn, off_rm, ptr, opr_sz, opr_sz, data, fn_gvec_ptr); - tcg_temp_free_ptr(fpst); + if (!ptr_is_env) { + tcg_temp_free_ptr(ptr); + } } 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;