From patchwork Mon Jun 21 16:27:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 464551 Delivered-To: patch@linaro.org Received: by 2002:a17:906:71d0:0:0:0:0 with SMTP id i16csp4373485ejk; Mon, 21 Jun 2021 09:42:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwL14khrZ63bWNCGvKifEVOzXYCQAZqKYzgUsrx7z5veXeWRgavxkv13jQPTgAhQYDvmNMg X-Received: by 2002:a17:906:914a:: with SMTP id y10mr9493255ejw.235.1624293731442; Mon, 21 Jun 2021 09:42:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624293731; cv=none; d=google.com; s=arc-20160816; b=ESiEpdBax00lGQZ5YQJ8Kk8O/95UKy7R2WmIJfWow75VFXezjPms+0Mshpf9v55ZpP LAzWsL4eGj1TS2U52GVr6coPoFUTZv/nNgBRT81e2yThJnLsNf+U9wkEAW+OY8JX69Sg 9A/mAdinHTtOQBacGUQYy7HCfRPoghk9VQn5nlyjtV2K1ha+jjHHQEnO1RKyO3vAs1KD GGQmjfY7Uorbss43uESY0GNbDASh/pgmyoAXFJolH1lXBer4Y7OY2saRQZdwrJ77j4RL pYCBeqYLPGVIsLeLFuq4iIiRnEbv/PvnE8O2dFiYtVYCI8YZyD87nqZLhFVS7jApxbBo UTtQ== 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=bOrWgH6D9wT/HZ6doPa+NnAplBwQgyIlj9yTfgLHvrc=; b=jSoTi4DT9cEOh8CZjh7NeSXGXPzHIFvd7VdrAWSf1nRFq71Kk+cHnQNFudvgsYLesi DHv59WA1lH7kKLvj7p5Fh7g0BpUYUrA13JGL08eKaWo8XrUqML1N4/CZUPzgfbLXi3U5 Tz9/SzIGxZxn6t917w8bweIt4XOiqiqM7V0Grq5liH3t2z93EL+iMzusRDZZ9pqRwEHc IEqJ3ebeeuJoM0DRqCZfuFoBfmJlHPLFgqWRYpZ/pa2d8EfhOZosFkLOPeSyBBOcrWPc AtqoyvwXzkI6JzRMWwKkIEXt3w8u7Xs9EavUhnDDWXZvKu2VpTgEnFq+TN8d9ArcZOfg YzLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w4GeOgEH; 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 c7si6757481edy.367.2021.06.21.09.42.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jun 2021 09:42:11 -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=w4GeOgEH; 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]:41740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvMzy-0005Nf-4I for patch@linaro.org; Mon, 21 Jun 2021 12:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvMnM-0007H4-Uj for qemu-devel@nongnu.org; Mon, 21 Jun 2021 12:29:08 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:40647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvMnD-0007b2-4v for qemu-devel@nongnu.org; Mon, 21 Jun 2021 12:29:08 -0400 Received: by mail-wm1-x32c.google.com with SMTP id n35-20020a05600c3ba3b02901cdecb6bda8so14316484wms.5 for ; Mon, 21 Jun 2021 09:28:57 -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=bOrWgH6D9wT/HZ6doPa+NnAplBwQgyIlj9yTfgLHvrc=; b=w4GeOgEHhXr4N+G7eTAjNLkfoQyu6/kROUsZTII0isG9Dr/WXhd51N+jsUrNZg9SF8 5DEPP7ov4BPhqBiR12KKtSLjpkZpc5uCrvJ2Gho3NP5rIwblPAPLhX62AOayuI7Fgkxv sqfiGnGjPKoRMYOFaWa+CtSdSbph97xYPW+1C5vgBgk08NYD7TbCjWuVxxFSFFkmdoBa fSnCNwQJsuJRHhuX5Zi6MjVZJwlq9QZCRWjP9LGifAB7/464QFHZfllSv+q0nsOg6G1F l4ITiPRTG33nRQbeRy/UtqieGJENaBmHedJdLNooJRiUnN/tawzYJ1jA+/8pFelrITRo DkgQ== 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=bOrWgH6D9wT/HZ6doPa+NnAplBwQgyIlj9yTfgLHvrc=; b=qEnxtVflzj6A0D6lo1k3ffWgUE6rnQzE2EHaOpRK0HyOXqHTxG/4+AGHrIfc5z7HAd SzbL+9VL8qOTdwgd0IzSigGm1fYA9mQFwmuwAxP7q4LbYM/iooZa0Y5oaF/zxNlscNeG w0j6nJ7gfSK95CLppv5URbVT0wohFVt3i17lVlN8XW1ul/qqf4dUAySd6jpgfVA/FWcS E9w5wFrVSmsq7a5voZybEDxFaF286VBTJa50a3+n2Dy2XTStkl+3S2ei4vrV/0YfXXRh yvnn1gLPdTt8Mh61N/L67j0Ra5L2qkGWfpkrUvVjo2q/l3TtgWbfOJfHwHdKo9sIEjsr 9fVA== X-Gm-Message-State: AOAM5335cDwX1pdVDzwzkQgsDxJqzQnD5Gmg91CukJ0bYDqmxHCje0Uy 8mT5HDWl+IE1EuLixWfuzD3938149GyGViI8 X-Received: by 2002:a05:600c:3791:: with SMTP id o17mr14710818wmr.187.1624292937011; Mon, 21 Jun 2021 09:28:57 -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.28.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 09:28:56 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 23/57] target/arm: Implement MVE VADD, VSUB, VMUL Date: Mon, 21 Jun 2021 17:27:59 +0100 Message-Id: <20210621162833.32535-24-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::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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 VADD, VSUB and VMUL insns. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20210617121628.20116-13-peter.maydell@linaro.org --- target/arm/helper-mve.h | 12 ++++++++++++ target/arm/mve.decode | 5 +++++ target/arm/mve_helper.c | 14 ++++++++++++++ target/arm/translate-mve.c | 16 ++++++++++++++++ 4 files changed, 47 insertions(+) -- 2.20.1 diff --git a/target/arm/helper-mve.h b/target/arm/helper-mve.h index 01b6123f250..707b9cbd546 100644 --- a/target/arm/helper-mve.h +++ b/target/arm/helper-mve.h @@ -69,3 +69,15 @@ DEF_HELPER_FLAGS_4(mve_vbic, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) DEF_HELPER_FLAGS_4(mve_vorr, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) DEF_HELPER_FLAGS_4(mve_vorn, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) DEF_HELPER_FLAGS_4(mve_veor, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) + +DEF_HELPER_FLAGS_4(mve_vaddb, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) +DEF_HELPER_FLAGS_4(mve_vaddh, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) +DEF_HELPER_FLAGS_4(mve_vaddw, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) + +DEF_HELPER_FLAGS_4(mve_vsubb, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) +DEF_HELPER_FLAGS_4(mve_vsubh, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) +DEF_HELPER_FLAGS_4(mve_vsubw, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) + +DEF_HELPER_FLAGS_4(mve_vmulb, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) +DEF_HELPER_FLAGS_4(mve_vmulh, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) +DEF_HELPER_FLAGS_4(mve_vmulw, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr) diff --git a/target/arm/mve.decode b/target/arm/mve.decode index 332e0b8d1d6..f7d1d303f17 100644 --- a/target/arm/mve.decode +++ b/target/arm/mve.decode @@ -33,6 +33,7 @@ @1op .... .... .... size:2 .. .... .... .... .... &1op qd=%qd qm=%qm @1op_nosz .... .... .... .... .... .... .... .... &1op qd=%qd qm=%qm size=0 +@2op .... .... .. size:2 .... .... .... .... .... &2op qd=%qd qm=%qm qn=%qn @2op_nosz .... .... .... .... .... .... .... .... &2op qd=%qd qm=%qm qn=%qn size=0 # Vector loads and stores @@ -77,6 +78,10 @@ VORR 1110 1111 0 . 10 ... 0 ... 0 0001 . 1 . 1 ... 0 @2op_nosz VORN 1110 1111 0 . 11 ... 0 ... 0 0001 . 1 . 1 ... 0 @2op_nosz VEOR 1111 1111 0 . 00 ... 0 ... 0 0001 . 1 . 1 ... 0 @2op_nosz +VADD 1110 1111 0 . .. ... 0 ... 0 1000 . 1 . 0 ... 0 @2op +VSUB 1111 1111 0 . .. ... 0 ... 0 1000 . 1 . 0 ... 0 @2op +VMUL 1110 1111 0 . .. ... 0 ... 0 1001 . 1 . 1 ... 0 @2op + # Vector miscellaneous VCLS 1111 1111 1 . 11 .. 00 ... 0 0100 01 . 0 ... 0 @1op diff --git a/target/arm/mve_helper.c b/target/arm/mve_helper.c index da62b0e012b..23da96402eb 100644 --- a/target/arm/mve_helper.c +++ b/target/arm/mve_helper.c @@ -337,6 +337,12 @@ DO_1OP(vfnegs, 8, uint64_t, DO_FNEGS) mve_advance_vpt(env); \ } +/* provide unsigned 2-op helpers for all sizes */ +#define DO_2OP_U(OP, FN) \ + DO_2OP(OP##b, 1, uint8_t, FN) \ + DO_2OP(OP##h, 2, uint16_t, FN) \ + DO_2OP(OP##w, 4, uint32_t, FN) + #define DO_AND(N, M) ((N) & (M)) #define DO_BIC(N, M) ((N) & ~(M)) #define DO_ORR(N, M) ((N) | (M)) @@ -348,3 +354,11 @@ DO_2OP(vbic, 8, uint64_t, DO_BIC) DO_2OP(vorr, 8, uint64_t, DO_ORR) DO_2OP(vorn, 8, uint64_t, DO_ORN) DO_2OP(veor, 8, uint64_t, DO_EOR) + +#define DO_ADD(N, M) ((N) + (M)) +#define DO_SUB(N, M) ((N) - (M)) +#define DO_MUL(N, M) ((N) * (M)) + +DO_2OP_U(vadd, DO_ADD) +DO_2OP_U(vsub, DO_SUB) +DO_2OP_U(vmul, DO_MUL) diff --git a/target/arm/translate-mve.c b/target/arm/translate-mve.c index 2546567774c..5d3dee46995 100644 --- a/target/arm/translate-mve.c +++ b/target/arm/translate-mve.c @@ -331,3 +331,19 @@ DO_LOGIC(VBIC, gen_helper_mve_vbic) DO_LOGIC(VORR, gen_helper_mve_vorr) DO_LOGIC(VORN, gen_helper_mve_vorn) DO_LOGIC(VEOR, gen_helper_mve_veor) + +#define DO_2OP(INSN, FN) \ + static bool trans_##INSN(DisasContext *s, arg_2op *a) \ + { \ + static MVEGenTwoOpFn * const fns[] = { \ + gen_helper_mve_##FN##b, \ + gen_helper_mve_##FN##h, \ + gen_helper_mve_##FN##w, \ + NULL, \ + }; \ + return do_2op(s, a, fns[a->size]); \ + } + +DO_2OP(VADD, vadd) +DO_2OP(VSUB, vsub) +DO_2OP(VMUL, vmul)