From patchwork Mon Jun 28 13:58:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 467996 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4019488jao; Mon, 28 Jun 2021 07:08:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx65nX0CWOudzILMYEWY3aa33ee+U8tlewwRpPD7AuX6XO2MVB/sZf1NhgMrBz26dNqyfLV X-Received: by 2002:aa7:dd53:: with SMTP id o19mr34012117edw.259.1624889281115; Mon, 28 Jun 2021 07:08:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624889281; cv=none; d=google.com; s=arc-20160816; b=vouAWE0q8GXeIeuotnOed5up9Ved9h8oo8/dO220qyRFZ9/hqCW9PHjclivJXOYHTQ 8H+BYekwXJ6ogl6kgjFq+gtBux4lBWzkQ952ecEbTywMjSiXQ1qeFN6zdZYWrO9pKtSf DFdfzhCVDM1qTmwhNPWOPxHMHKoYl5L1UNYg8yqMVYPOJSB4L/wp1NAHFZDd/g01qacf 6m4/FAVHyeflxHrYz9uym1VwPOYwrklXqpE/DcrQIpdZHzcxBisH/i8JJ7a0tlNs2fDe NWCMmOxwAaT5p2bOzCzrwI3V8aqY4eXvgH6Jnv8BUIiosipeYExjGS46AFY2DTmdJF5U bXHg== 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=thBDPgVXDgiVK3QY8+JG8UlP37lm5nK8lYpY8XMKh2M=; b=XIPhKKbshbwhAtEXDqr1ZA2g3IFKA1OlWuD7P+SoU8p1tYgQVnoKrMCXZiBtf5qL4Q jcpykGc5rNmbEK75noX2kK4qGjwFX4NNRKwSnzOCAX+98cWcquYd9MeMFqjvGhDQ3R7N H3uyCoMkqboUmY5AEH9MtQO/3TowZHNq7bkrgvITKUlOKd8hoE1pQ0cTNnku567Wny7D 7Cw3G2P7XefAHUKdlQG5K2doWdV+BX0kE9bi3s3aRHVAgFGiG7NysYLvXv5VxHXa2XtB cMb9+ZYZYi+G7fo39x9/kbK7GzsRBRNuSWE17vhXJ14eIkk0zg+hw3CTg08fCcD5m6DG NCDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UBWbpnUo; 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 l21si8818187edw.390.2021.06.28.07.08.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Jun 2021 07:08:01 -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=UBWbpnUo; 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]:45684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxrva-0001aX-6H for patch@linaro.org; Mon, 28 Jun 2021 10:08:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxrn3-0003Ok-OH for qemu-devel@nongnu.org; Mon, 28 Jun 2021 09:59:09 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:43557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxrmk-00065O-RS for qemu-devel@nongnu.org; Mon, 28 Jun 2021 09:59:09 -0400 Received: by mail-wm1-x331.google.com with SMTP id p8-20020a7bcc880000b02901dbb595a9f1so21438wma.2 for ; Mon, 28 Jun 2021 06:58:45 -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=thBDPgVXDgiVK3QY8+JG8UlP37lm5nK8lYpY8XMKh2M=; b=UBWbpnUo7Q4hKzXgw5IAP3hIqG5xGl0yWQj2dq8HfgKoNRku4u8sQLxFmgJOhlnHcO VnTRa1AJjU2gGs9HFBgNCK6YGTK5hVplvr9Zcq2gNl8R+zoh4XVXAWpFUAIR8G+HQtZh t2FZKHzexN3qFNl3ckBfcAKCVG6oLV+XznGjYzcB+b0T7KJTsq1+k2WHAkhOJ4ZZeAQ5 RBa2t05UGh2o1kn+ENKL6m29XDGDOatP30CpCWdnS8iKg1rMSQu/ldVBPu1NFd0qX16C YYl/vkSLVVxImlzqfVs7wsDMm1IXeAvkhTy4rbxpwne6SFKH/9w+j/8Pmo8i4EhLZ1v/ UK5g== 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=thBDPgVXDgiVK3QY8+JG8UlP37lm5nK8lYpY8XMKh2M=; b=C0K1ZrObiJH8OT/VuXyXRqrbdIGN55vmEoBpBD8QviwM7boThNpj/njjbr37y9nSec nZ9ALFyV/QRs1o+Cm9DKo3QNwoOpQ9JhvKHIKqRA8rX1nrogwtGbokJqENaaW0K6TRQN Xl6WBKC3LOz5bBrIO6bPxqBau8QeH3WoR14qsgH04yz5XgYpRMRh4M2WctrFoPT1zGwG Y8gk63574LKQVPI1jlJY47sg6zvAX0RcsJ4HRNQxWfE36vX7G95xruX2UvNE1QWvL2at k/78gEx9SGS5A5KDd2Njx2UJft94507rHsNnhNe/P9yP0b5ycLFg081Els34xmiqn7se ZhHA== X-Gm-Message-State: AOAM530T7hcgFyZJUYoqFyZysb8VLjZgN13uW5VsbVF3YJpE+ctmXx0b jTJqO2n4GwwVP9vp5PjHSTnIWA== X-Received: by 2002:a05:600c:3b1e:: with SMTP id m30mr26535093wms.25.1624888724371; Mon, 28 Jun 2021 06:58:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 06:58:44 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 10/18] target/arm: Implement MVE VSRI, VSLI Date: Mon, 28 Jun 2021 14:58:27 +0100 Message-Id: <20210628135835.6690-11-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::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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 MVE VSRI and VSLI insns, which perform a shift-and-insert operation. Signed-off-by: Peter Maydell --- target/arm/helper-mve.h | 8 ++++++++ target/arm/mve.decode | 9 ++++++++ target/arm/mve_helper.c | 42 ++++++++++++++++++++++++++++++++++++++ target/arm/translate-mve.c | 3 +++ 4 files changed, 62 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/helper-mve.h b/target/arm/helper-mve.h index 8af0e7fd8cf..e452d2ef7a0 100644 --- a/target/arm/helper-mve.h +++ b/target/arm/helper-mve.h @@ -396,3 +396,11 @@ DEF_HELPER_FLAGS_4(mve_vshlltsb, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) DEF_HELPER_FLAGS_4(mve_vshlltsh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) DEF_HELPER_FLAGS_4(mve_vshlltub, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) DEF_HELPER_FLAGS_4(mve_vshlltuh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) + +DEF_HELPER_FLAGS_4(mve_vsrib, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vsrih, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vsriw, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) + +DEF_HELPER_FLAGS_4(mve_vslib, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vslih, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vsliw, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) diff --git a/target/arm/mve.decode b/target/arm/mve.decode index 6e6032b25a7..c3b5366617a 100644 --- a/target/arm/mve.decode +++ b/target/arm/mve.decode @@ -371,3 +371,12 @@ VSHLL_TS 111 0 1110 1 . 1 .. ... ... 1 1111 0 1 . 0 ... 0 @2_shll_h VSHLL_TU 111 1 1110 1 . 1 .. ... ... 1 1111 0 1 . 0 ... 0 @2_shll_b VSHLL_TU 111 1 1110 1 . 1 .. ... ... 1 1111 0 1 . 0 ... 0 @2_shll_h + +# Shift-and-insert +VSRI 111 1 1111 1 . ... ... ... 0 0100 0 1 . 1 ... 0 @2_shr_b +VSRI 111 1 1111 1 . ... ... ... 0 0100 0 1 . 1 ... 0 @2_shr_h +VSRI 111 1 1111 1 . ... ... ... 0 0100 0 1 . 1 ... 0 @2_shr_w + +VSLI 111 1 1111 1 . ... ... ... 0 0101 0 1 . 1 ... 0 @2_shl_b +VSLI 111 1 1111 1 . ... ... ... 0 0101 0 1 . 1 ... 0 @2_shl_h +VSLI 111 1 1111 1 . ... ... ... 0 0101 0 1 . 1 ... 0 @2_shl_w diff --git a/target/arm/mve_helper.c b/target/arm/mve_helper.c index 8798e77cba8..24336d1d28a 100644 --- a/target/arm/mve_helper.c +++ b/target/arm/mve_helper.c @@ -1251,6 +1251,48 @@ DO_2SHIFT_SAT_S(vqshlui_s, DO_SUQSHL_OP) DO_2SHIFT_U(vrshli_u, DO_VRSHLU) DO_2SHIFT_S(vrshli_s, DO_VRSHLS) +/* Shift-and-insert; we always work with 64 bits at a time */ +#define DO_2SHIFT_INSERT(OP, ESIZE, SHIFTFN, MASKFN) \ + void HELPER(glue(mve_, OP))(CPUARMState *env, void *vd, \ + void *vm, uint32_t shift) \ + { \ + uint64_t *d = vd, *m = vm; \ + uint16_t mask; \ + uint64_t shiftmask; \ + unsigned e; \ + if (shift == 0 || shift == ESIZE * 8) { \ + /* \ + * Only VSLI can shift by 0; only VSRI can shift by
. \ + * The generic logic would give the right answer for 0 but \ + * fails for
. \ + */ \ + goto done; \ + } \ + assert(shift < ESIZE * 8); \ + mask = mve_element_mask(env); \ + /* ESIZE / 2 gives the MO_* value if ESIZE is in [1,2,4] */ \ + shiftmask = dup_const(ESIZE / 2, MASKFN(ESIZE * 8, shift)); \ + for (e = 0; e < 16 / 8; e++, mask >>= 8) { \ + uint64_t r = (SHIFTFN(m[H8(e)], shift) & shiftmask) | \ + (d[H8(e)] & ~shiftmask); \ + mergemask(&d[H8(e)], r, mask); \ + } \ +done: \ + mve_advance_vpt(env); \ + } + +#define DO_SHL(N, SHIFT) ((N) << (SHIFT)) +#define DO_SHR(N, SHIFT) ((N) >> (SHIFT)) +#define SHL_MASK(EBITS, SHIFT) MAKE_64BIT_MASK((SHIFT), (EBITS) - (SHIFT)) +#define SHR_MASK(EBITS, SHIFT) MAKE_64BIT_MASK(0, (EBITS) - (SHIFT)) + +DO_2SHIFT_INSERT(vsrib, 1, DO_SHR, SHR_MASK) +DO_2SHIFT_INSERT(vsrih, 2, DO_SHR, SHR_MASK) +DO_2SHIFT_INSERT(vsriw, 4, DO_SHR, SHR_MASK) +DO_2SHIFT_INSERT(vslib, 1, DO_SHL, SHL_MASK) +DO_2SHIFT_INSERT(vslih, 2, DO_SHL, SHL_MASK) +DO_2SHIFT_INSERT(vsliw, 4, DO_SHL, SHL_MASK) + /* * Long shifts taking half-sized inputs from top or bottom of the input * vector and producing a double-width result. ESIZE, TYPE are for diff --git a/target/arm/translate-mve.c b/target/arm/translate-mve.c index 044462c3752..b031f84966e 100644 --- a/target/arm/translate-mve.c +++ b/target/arm/translate-mve.c @@ -894,6 +894,9 @@ DO_2SHIFT(VSHRI_U, vshli_u, true) DO_2SHIFT(VRSHRI_S, vrshli_s, true) DO_2SHIFT(VRSHRI_U, vrshli_u, true) +DO_2SHIFT(VSRI, vsri, false) +DO_2SHIFT(VSLI, vsli, false) + #define DO_VSHLL(INSN, FN) \ static bool trans_##INSN(DisasContext *s, arg_2shift *a) \ { \