From patchwork Mon Jun 21 16:28:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 464563 Delivered-To: patch@linaro.org Received: by 2002:a17:906:71d0:0:0:0:0 with SMTP id i16csp4377858ejk; Mon, 21 Jun 2021 09:47:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMVZoCbnxl9a5Fh207GfnmNaCcHbWZId1uXhqHMXytTfWjOrymBNwva7lVNpcqEOoYajhc X-Received: by 2002:a67:14c1:: with SMTP id 184mr18706562vsu.38.1624294052490; Mon, 21 Jun 2021 09:47:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624294052; cv=none; d=google.com; s=arc-20160816; b=HyRJXVf0THpbbDOebERb0a34uU1uqbf9z7JqXyKEChtoYG+ko+KwudtaIji7+MhuiM dHF0X1AxIpeaMtgX7dUjaEP1/WxWn1zqHVvhwvFu+2HGGcBW3ISWEmvLTC+MWh4ipyqy eSJmcWeBT7z56QbdT3yLD5hRRMfcceCRgJ5Wdh4xB2R9b5HGxO+5LDz3D1mImng9pH6i dWU4+czk8QWTdG+LB3/sl+SMR0noNa3fx3QuJT9mF6wXfhOQiefCGPBvKf6FlOvlkFaf 28neS86GtOKnheZJtIH/i+sx0swRp0rmEig6yZsroX6fBnmSVZChEtLObmsw+nb5g/8d Hkng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=dhuMX4NZN9G6OsGkwHdDrnFWUUwOWzoovOGUYw4T3Mw=; b=CAZeb5E3ccdldlt+1E+rdtv/7T6iXe7WoUCi+RLoUcNOd/iU3AoDgFDdkKx2IGGMb6 g/I1v9nqTA2HOOV/ymY3xUO3x5ICp0GHa5wZJqnpVBUJDBdaPoVSQGWC0jcRmLkn+Lhi mHEPF7eP3MQ6i6r+a1/WxGnzZcU7/5OjHhKEfqRLKQQvAQ+XXAydAzy2X5RdLNkiXpRG bsAgXYome9Vd+wx7ksSWiCMq5pNUYcMTojoXYjAroQKM/12nXrSRJoljsx9IKPP4DMoK bqR3xmtnj9zu1bRrhmilSLRxaTJcEHjf9VoK90QTush5xlh1j0RQ9cKSXZppptFuxtRn w5zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dh5Tjx5n; 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=pass (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 y5si11706948vke.36.2021.06.21.09.47.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jun 2021 09:47:32 -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=pass header.i=@linaro.org header.s=google header.b=dh5Tjx5n; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvN59-0001z4-LN for patch@linaro.org; Mon, 21 Jun 2021 12:47:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvMnQ-0007RA-DZ for qemu-devel@nongnu.org; Mon, 21 Jun 2021 12:29:12 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:42976) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvMnM-0007fR-L9 for qemu-devel@nongnu.org; Mon, 21 Jun 2021 12:29:12 -0400 Received: by mail-wm1-x32b.google.com with SMTP id l7-20020a05600c1d07b02901b0e2ebd6deso407611wms.1 for ; Mon, 21 Jun 2021 09:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=dhuMX4NZN9G6OsGkwHdDrnFWUUwOWzoovOGUYw4T3Mw=; b=dh5Tjx5n3o51XVNPh5j98Jh0y7U8+Pkv4Uc0oZi8DPP2dfTWbwZGGl7LxvS3C59cV7 BtXZUMMj0V2PXSd4CpG4CjbXyL3AxwctREFvTvfaE5EyU2yOGk+13xIvBhUSl9GNHL0j WVyuKNbWrUGnmA4AF0BmqEmQpsvT9n+DevXhVV3QTLnWBarwJUcnNR0GtDhObmjLqiUx lMeH9YU/wllWjKWEmHyrFwJdNbi3MSv31SVKGC29IHE+Yb6O1NHPJ3BM0l1oGiup9Bz9 xOL6BOtzvaVcc0L5HDYu2ybRYRex5siF7SeBfFTI50e/fpTKBCC2sgrEkD7WXnX1BaaV geIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dhuMX4NZN9G6OsGkwHdDrnFWUUwOWzoovOGUYw4T3Mw=; b=JMyO6P8VmR8dh/6MZgWEMELad3TQrzpTxSuafSUqxfWlWLqx7phQyutaAffJwrsGzL x7UW+K32U3yL92Nl7Ie0Z8Sxad4BYd4EJhgjHZxuOO4mRuIy6ci+JwJV6owL7KwB6zCa 4X1rrigz+E81g0KDY1CPsj4hH6unj57iJjqocv+Q7W1JiOSA2Ta09lrA+r+QXzAKiQho S0ZRJqAALhzbbwTm/x+ZWXHuu0qLrr7GGToRHcypfncaQhW+JP36Snfp5fMv+uOSl3jW UFjUC2+NhlArCNSx2+7byANhvOScXMJMM8jHrk4xNUwVu7UEWhCdQWVVktBg9+GD4nx0 LxNw== X-Gm-Message-State: AOAM532cbyeWcOOfR4odp9Y13MojKj2Vh/0AmPIxpOZUwJmTTM7gz4R8 6gwxm2FH6M00IwI2eOBPhMarqWeRl5SBODse X-Received: by 2002:a1c:1b10:: with SMTP id b16mr28466566wmb.130.1624292947156; Mon, 21 Jun 2021 09:29:07 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n65sm11615496wme.21.2021.06.21.09.29.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 09:29:06 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/57] target/arm: Implement MVE VADD (scalar) Date: Mon, 21 Jun 2021 17:28:09 +0100 Message-Id: <20210621162833.32535-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210621162833.32535-1-peter.maydell@linaro.org> References: <20210621162833.32535-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Implement the scalar form of the MVE VADD insn. This takes the scalar operand from a general purpose register. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20210617121628.20116-23-peter.maydell@linaro.org --- target/arm/helper-mve.h | 4 ++++ target/arm/mve.decode | 7 ++++++ target/arm/mve_helper.c | 22 +++++++++++++++++++ target/arm/translate-mve.c | 45 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) -- 2.20.1 diff --git a/target/arm/helper-mve.h b/target/arm/helper-mve.h index f9d4b242beb..16b974a4270 100644 --- a/target/arm/helper-mve.h +++ b/target/arm/helper-mve.h @@ -145,6 +145,10 @@ DEF_HELPER_FLAGS_4(mve_vmulltub, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) DEF_HELPER_FLAGS_4(mve_vmulltuh, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) DEF_HELPER_FLAGS_4(mve_vmulltuw, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) +DEF_HELPER_FLAGS_4(mve_vadd_scalarb, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vadd_scalarh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vadd_scalarw, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) + DEF_HELPER_FLAGS_4(mve_vmlaldavsh, TCG_CALL_NO_WG, i64, env, ptr, ptr, i64) DEF_HELPER_FLAGS_4(mve_vmlaldavsw, TCG_CALL_NO_WG, i64, env, ptr, ptr, i64) DEF_HELPER_FLAGS_4(mve_vmlaldavxsh, TCG_CALL_NO_WG, i64, env, ptr, ptr, i64) diff --git a/target/arm/mve.decode b/target/arm/mve.decode index ac68f072bbe..0ee7a727081 100644 --- a/target/arm/mve.decode +++ b/target/arm/mve.decode @@ -26,6 +26,7 @@ &vldr_vstr rn qd imm p a w size l u &1op qd qm size &2op qd qm qn size +&2scalar qd qn rm size @vldr_vstr ....... . . . . l:1 rn:4 ... ...... imm:7 &vldr_vstr qd=%qd u=0 # Note that both Rn and Qd are 3 bits only (no D bit) @@ -36,6 +37,8 @@ @2op .... .... .. size:2 .... .... .... .... .... &2op qd=%qd qm=%qm qn=%qn @2op_nosz .... .... .... .... .... .... .... .... &2op qd=%qd qm=%qm qn=%qn size=0 +@2scalar .... .... .. size:2 .... .... .... .... rm:4 &2scalar qd=%qd qn=%qn + # Vector loads and stores # Widening loads and narrowing stores: @@ -154,3 +157,7 @@ VRMLALDAVH_S 1110 1110 1 ... ... 0 ... x:1 1111 . 0 a:1 0 ... 0 @vmlaldav_no VRMLALDAVH_U 1111 1110 1 ... ... 0 ... x:1 1111 . 0 a:1 0 ... 0 @vmlaldav_nosz VRMLSLDAVH 1111 1110 1 ... ... 0 ... x:1 1110 . 0 a:1 0 ... 1 @vmlaldav_nosz + +# Scalar operations + +VADD_scalar 1110 1110 0 . .. ... 1 ... 0 1111 . 100 .... @2scalar diff --git a/target/arm/mve_helper.c b/target/arm/mve_helper.c index 241cceaccba..cb97709fcac 100644 --- a/target/arm/mve_helper.c +++ b/target/arm/mve_helper.c @@ -491,6 +491,28 @@ DO_2OP_S(vhsubs, do_vhsub_s) DO_2OP_U(vhsubu, do_vhsub_u) +#define DO_2OP_SCALAR(OP, ESIZE, TYPE, FN) \ + void HELPER(glue(mve_, OP))(CPUARMState *env, void *vd, void *vn, \ + uint32_t rm) \ + { \ + TYPE *d = vd, *n = vn; \ + TYPE m = rm; \ + uint16_t mask = mve_element_mask(env); \ + unsigned e; \ + for (e = 0; e < 16 / ESIZE; e++, mask >>= ESIZE) { \ + mergemask(&d[H##ESIZE(e)], FN(n[H##ESIZE(e)], m), mask); \ + } \ + mve_advance_vpt(env); \ + } + +/* provide unsigned 2-op scalar helpers for all sizes */ +#define DO_2OP_SCALAR_U(OP, FN) \ + DO_2OP_SCALAR(OP##b, 1, uint8_t, FN) \ + DO_2OP_SCALAR(OP##h, 2, uint16_t, FN) \ + DO_2OP_SCALAR(OP##w, 4, uint32_t, FN) + +DO_2OP_SCALAR_U(vadd_scalar, DO_ADD) + /* * Multiply add long dual accumulate ops. */ diff --git a/target/arm/translate-mve.c b/target/arm/translate-mve.c index a0c4f10a935..388848b4ff0 100644 --- a/target/arm/translate-mve.c +++ b/target/arm/translate-mve.c @@ -31,6 +31,7 @@ typedef void MVEGenLdStFn(TCGv_ptr, TCGv_ptr, TCGv_i32); typedef void MVEGenOneOpFn(TCGv_ptr, TCGv_ptr, TCGv_ptr); typedef void MVEGenTwoOpFn(TCGv_ptr, TCGv_ptr, TCGv_ptr, TCGv_ptr); +typedef void MVEGenTwoOpScalarFn(TCGv_ptr, TCGv_ptr, TCGv_ptr, TCGv_i32); typedef void MVEGenDualAccOpFn(TCGv_i64, TCGv_ptr, TCGv_ptr, TCGv_ptr, TCGv_i64); /* Return the offset of a Qn register (same semantics as aa32_vfp_qreg()) */ @@ -383,6 +384,50 @@ DO_2OP(VMULL_BU, vmullbu) DO_2OP(VMULL_TS, vmullts) DO_2OP(VMULL_TU, vmulltu) +static bool do_2op_scalar(DisasContext *s, arg_2scalar *a, + MVEGenTwoOpScalarFn fn) +{ + TCGv_ptr qd, qn; + TCGv_i32 rm; + + if (!dc_isar_feature(aa32_mve, s) || + !mve_check_qreg_bank(s, a->qd | a->qn) || + !fn) { + return false; + } + if (a->rm == 13 || a->rm == 15) { + /* UNPREDICTABLE */ + return false; + } + if (!mve_eci_check(s) || !vfp_access_check(s)) { + return true; + } + + qd = mve_qreg_ptr(a->qd); + qn = mve_qreg_ptr(a->qn); + rm = load_reg(s, a->rm); + fn(cpu_env, qd, qn, rm); + tcg_temp_free_i32(rm); + tcg_temp_free_ptr(qd); + tcg_temp_free_ptr(qn); + mve_update_eci(s); + return true; +} + +#define DO_2OP_SCALAR(INSN, FN) \ + static bool trans_##INSN(DisasContext *s, arg_2scalar *a) \ + { \ + static MVEGenTwoOpScalarFn * const fns[] = { \ + gen_helper_mve_##FN##b, \ + gen_helper_mve_##FN##h, \ + gen_helper_mve_##FN##w, \ + NULL, \ + }; \ + return do_2op_scalar(s, a, fns[a->size]); \ + } + +DO_2OP_SCALAR(VADD_scalar, vadd_scalar) + static bool do_long_dual_acc(DisasContext *s, arg_vmlaldav *a, MVEGenDualAccOpFn *fn) {