From patchwork Mon Jun 28 13:58:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 468004 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4024837jao; Mon, 28 Jun 2021 07:13:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxP8gSz1dKOjBbipUYFqX9Lyeg4qK6mL8S5LjowGlVEk5DqGClR54pdftBZi1cdplb3R8b2 X-Received: by 2002:a05:6402:5114:: with SMTP id m20mr13698948edd.174.1624889631961; Mon, 28 Jun 2021 07:13:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624889631; cv=none; d=google.com; s=arc-20160816; b=w/sOAuFIP9K3BEKhlHB/eJ9blk3PKV1nx+ErM3lf9oqxrb5BUpJNEtgkaFE+YzgJ2D JtCj8J/frAq36iu3HCvOogyB2MOw2KLvcYei1WkD97GxcK1QOF0S+O/r9N8o7ih06LR+ LZKr8IzZKwmYB7c3e86C5z7DDAnjVHdqen/bqRzhSMs1z5HhFfxQFWKPKABCZg5XGv5X Ksfo0IFGcAwe7AekJME5MPjlWfUhzWE3To/hP2/sbQxd+hGQVC0LJO/dpFsLAio8W7tb 57VZ4ErUJZyj3pJzfm3MMqgE+GURLOKJqwQ3ziPAULKgs4LAZJG4+TlW2Ih9lHg2J0pH ZXDw== 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=ACAUeCX9+Wz6GLIq3XrxvGBI0qMISpWslzw8tcPYLUU=; b=LCR1duws5y5kUMCA74DfNszRd+1SbH7v2Fcrh2LuE/WbXxFMKqWBx2zF4K6aIhLr4L AnFeXiLWcLkVCGOf7JknY3ACex2Q1GXmthEmrgk6tKWDU/V21lHAVx8iHXMszBMqVHA6 /7Uq0gRe04k7xklIknNWVOAR4loRzE6ZbJlspRhSDax/92C0HdqRwtDPxBC2k+Dopl4g yzA6pYEDmNt0PeU0yhYnILFtjuS+HdO/BKoJe1t5X9o/YVD4dQJFfaEK26tSCleLQW99 6bbTUwWiwBnfSn4I5p4ABYlXl7hFZShmL9o66idb9zVq2L/mwjWqoIwaKdB4soBWYJ5l KG/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="pXxlE/VJ"; 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 t8si14557319edd.161.2021.06.28.07.13.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Jun 2021 07:13:51 -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="pXxlE/VJ"; 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]:38172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxs1G-0007G1-Q6 for patch@linaro.org; Mon, 28 Jun 2021 10:13:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxrn3-0003Ox-OJ for qemu-devel@nongnu.org; Mon, 28 Jun 2021 09:59:09 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:40875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxrmk-00065s-Sc for qemu-devel@nongnu.org; Mon, 28 Jun 2021 09:59:09 -0400 Received: by mail-wr1-x42c.google.com with SMTP id g7so16805630wri.7 for ; Mon, 28 Jun 2021 06:58:47 -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=ACAUeCX9+Wz6GLIq3XrxvGBI0qMISpWslzw8tcPYLUU=; b=pXxlE/VJprXBlqDmBw8K41KFOcJQvMFmQcpftTunHiqNeK1Vd+zHmw0eXHErfophfy CeC/pYyF0IJTnWTBWaQJJAaYoxl2SLdZFNf8A2Nf+bvyc15G7PeL8srxL8CrfA70idrp k9eZdlS4DtyE7rGHPbqLY87jLsPwtstf4AvKWi0wrUyTx+ddVKl4jeoLW+us22vpkoRK zC6Xg4s5OgnGWnXLZqQflMF/awKMVUEEXLm9qkRG2ZClhqys1voienR4yN1QcJZvpGoC CNmrN3ntH7HpxQYadWHWey81xTqvJyQIvpBU7eCiIHLBtzKySJohCNWrKGT//EjB+oAd yUyg== 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=ACAUeCX9+Wz6GLIq3XrxvGBI0qMISpWslzw8tcPYLUU=; b=jNhhnwp9QJW9h0QdVxV9ieJC7j/BZjkluv2aVag7fwmhWq6wJ8GeDKKNLqPFujMjzc rIza517OOSZGHMqdQ9lFkwbXL6Qa7GpMc66cFEpFhRlqsunNGJ9H3toaxK1huw0Lbd56 JKYHzH+LJFWhCuUbmnYIjINsFLwAiXKiZvTUBw45obL1dFDSoEYzHqEz2J5jftzPdpvd 4sy32p9HE4/B5JuOcdvxKWMkLuWR4iRsQnBKTh3Yohj80VfwzvumMgFPyRI9GMFOmg6W 3Co+uYhBkJResy1TjldVwaCmGUdK3LiSL5AfffrU+y8TFUvtZm0Rb8fwwYbBSbxwXESf 0q6w== X-Gm-Message-State: AOAM530oaTOQYjS+od3T4yM2zwp5YSIy1gIrUo523GS72cXt9DhAAvLT KElzEg4zLrRVmfuOusbX/KA3Uw== X-Received: by 2002:a5d:698a:: with SMTP id g10mr26916272wru.129.1624888726388; Mon, 28 Jun 2021 06:58:46 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id d12sm12047627wri.77.2021.06.28.06.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 06:58:46 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 13/18] target/arm: Implement MVE VSHLC Date: Mon, 28 Jun 2021 14:58:30 +0100 Message-Id: <20210628135835.6690-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210628135835.6690-1-peter.maydell@linaro.org> References: <20210628135835.6690-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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=unavailable 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 MVE VSHLC insn, which performs a shift left of the entire vector with carry in bits provided from a general purpose register and carry out bits written back to that register. Signed-off-by: Peter Maydell --- target/arm/helper-mve.h | 2 ++ target/arm/mve.decode | 2 ++ target/arm/mve_helper.c | 38 ++++++++++++++++++++++++++++++++++++++ target/arm/translate-mve.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/helper-mve.h b/target/arm/helper-mve.h index 96b4c0dfd34..d414b6309d5 100644 --- a/target/arm/helper-mve.h +++ b/target/arm/helper-mve.h @@ -444,3 +444,5 @@ DEF_HELPER_FLAGS_4(mve_vqrshrunbb, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) DEF_HELPER_FLAGS_4(mve_vqrshrunbh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) DEF_HELPER_FLAGS_4(mve_vqrshruntb, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) DEF_HELPER_FLAGS_4(mve_vqrshrunth, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) + +DEF_HELPER_FLAGS_4(mve_vshlc, TCG_CALL_NO_WG, i32, env, ptr, i32, i32) diff --git a/target/arm/mve.decode b/target/arm/mve.decode index 1d11387bc07..914b108c379 100644 --- a/target/arm/mve.decode +++ b/target/arm/mve.decode @@ -419,3 +419,5 @@ VQRSHRUNB 111 1 1110 1 . ... ... ... 0 1111 1 1 . 0 ... 0 @2_shr_b VQRSHRUNB 111 1 1110 1 . ... ... ... 0 1111 1 1 . 0 ... 0 @2_shr_h VQRSHRUNT 111 1 1110 1 . ... ... ... 1 1111 1 1 . 0 ... 0 @2_shr_b VQRSHRUNT 111 1 1110 1 . ... ... ... 1 1111 1 1 . 0 ... 0 @2_shr_h + +VSHLC 111 0 1110 1 . 1 imm:5 ... 0 1111 1100 rdm:4 qd=%qd diff --git a/target/arm/mve_helper.c b/target/arm/mve_helper.c index 3e736e89095..9d4a07c1c0c 100644 --- a/target/arm/mve_helper.c +++ b/target/arm/mve_helper.c @@ -1468,3 +1468,41 @@ DO_VSHRN_SAT_UB(vqrshrnb_ub, vqrshrnt_ub, DO_RSHRN_UB) DO_VSHRN_SAT_UH(vqrshrnb_uh, vqrshrnt_uh, DO_RSHRN_UH) DO_VSHRN_SAT_SB(vqrshrunbb, vqrshruntb, DO_RSHRUN_B) DO_VSHRN_SAT_SH(vqrshrunbh, vqrshrunth, DO_RSHRUN_H) + +uint32_t HELPER(mve_vshlc)(CPUARMState *env, void *vd, uint32_t rdm, + uint32_t shift) +{ + uint32_t *d = vd; + uint16_t mask = mve_element_mask(env); + unsigned e; + uint32_t r; + + /* + * For each 32-bit element, we shift it left, bringing in the + * low 'shift' bits of rdm at the bottom. Bits shifted out at + * the top become the new rdm, if the predicate mask permits. + * The final rdm value is returned to update the register. + * shift == 0 here means "shift by 32 bits". + */ + if (shift == 0) { + for (e = 0; e < 16 / 4; e++, mask >>= 4) { + r = rdm; + if (mask & 1) { + rdm = d[H4(e)]; + } + mergemask(&d[H4(e)], r, mask); + } + } else { + uint32_t shiftmask = MAKE_64BIT_MASK(0, shift); + + for (e = 0; e < 16 / 4; e++, mask >>= 4) { + r = (d[H4(e)] << shift) | (rdm & shiftmask); + if (mask & 1) { + rdm = d[H4(e)] >> (32 - shift); + } + mergemask(&d[H4(e)], r, mask); + } + } + mve_advance_vpt(env); + return rdm; +} diff --git a/target/arm/translate-mve.c b/target/arm/translate-mve.c index eef4f1f6ce3..460dff260fe 100644 --- a/target/arm/translate-mve.c +++ b/target/arm/translate-mve.c @@ -938,3 +938,33 @@ DO_2SHIFT_N(VQRSHRNB_U, vqrshrnb_u) DO_2SHIFT_N(VQRSHRNT_U, vqrshrnt_u) DO_2SHIFT_N(VQRSHRUNB, vqrshrunb) DO_2SHIFT_N(VQRSHRUNT, vqrshrunt) + +static bool trans_VSHLC(DisasContext *s, arg_VSHLC *a) +{ + /* + * Whole Vector Left Shift with Carry. The carry is taken + * from a general purpose register and written back there. + * An imm of 0 means "shift by 32". + */ + TCGv_ptr qd; + TCGv_i32 rdm; + + if (!dc_isar_feature(aa32_mve, s) || !mve_check_qreg_bank(s, a->qd)) { + return false; + } + if (a->rdm == 13 || a->rdm == 15) { + /* CONSTRAINED UNPREDICTABLE: we UNDEF */ + return false; + } + if (!mve_eci_check(s) || !vfp_access_check(s)) { + return true; + } + + qd = mve_qreg_ptr(a->qd); + rdm = load_reg(s, a->rdm); + gen_helper_mve_vshlc(rdm, cpu_env, qd, rdm, tcg_constant_i32(a->imm)); + store_reg(s, a->rdm, rdm); + tcg_temp_free_ptr(qd); + mve_update_eci(s); + return true; +}