From patchwork Mon Jun 21 16:28: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: 464591 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp2783276jao; Mon, 21 Jun 2021 10:12:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrRV3r7xpf3szunFaAzHygzCxUpyHJ56ZQro3SIrxiyTPlClv+VtQctO/AV1l4IOJJhzHo X-Received: by 2002:a17:906:2b01:: with SMTP id a1mr12704435ejg.133.1624295535628; Mon, 21 Jun 2021 10:12:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624295535; cv=none; d=google.com; s=arc-20160816; b=Edbby1aF0wrwEefjPjTAdAbyU55zB4VgeuG3Fc3TnhM6Qx1M4M2LepCDv10dZ41Spy UsUHkre0plqns4AAA1VJL6i0wSjYtXjGTdFLK6QPoP3nmxhX7Z+iDLJdOE9ad4wGG98o i5CDXq+jGeqTF9t7pYJBuBO8xzh+73v1SaHo/zhWgVvpKCzEnR0J1141PbnAiuyb53Hs 5szInPGViV+ICGdu42VAw6/u7rSDupiXxUdHChV1PqTVTu3sxnNALnuzD8dr9YJD9Uu9 yL/232tPQMqVNLSp8Pw/lPkn+hwQb7HIw0k5oIDgMUo0c0VcClOBOmdyJcM5wJM5TlYK T07Q== 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=8X2WoxaE4dD1xxcswTY7qTOf6HRiaTkdV1Ow/slXsxc=; b=b/tJsWjVbnXrTQNe5bmgi4QB3B15YO9OAmNc9xXaGvcKWXL0epP4KJfdiMB2Mt8iRv xNnMp1DKTEp7S/EofKtWuAn9jG9T4F/eXr5XYBVkEHWtVZlpdTZU6XfctGo8W6hSGQLa M98qUWyn/Jh6chr8YMUtKCdwjDGirAColWZ6nnCowZ1warSIF53moygUZ0v4XevG6ynt vCcKwdagauPaQMkojWbktcZwqQhDCNwGLbw1arfq1JZInJX+Zz7Vdch1QEqfDmqZarmO Sf1vPzENEOCmcRizng1775O5c7Anvi32LQxiOcMEFkFa7UtnfxAXEZoFsL0HSVaZRrI7 OCwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PYXByIFC; 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 ay24si18312219edb.162.2021.06.21.10.12.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jun 2021 10:12:15 -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=PYXByIFC; 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]:43688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvNT4-0005Md-9g for patch@linaro.org; Mon, 21 Jun 2021 13:12:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvMnd-00087g-Qq for qemu-devel@nongnu.org; Mon, 21 Jun 2021 12:29:25 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:51858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvMnb-0007p7-Qo for qemu-devel@nongnu.org; Mon, 21 Jun 2021 12:29:25 -0400 Received: by mail-wm1-x32d.google.com with SMTP id j10so4148786wms.1 for ; Mon, 21 Jun 2021 09:29:23 -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=8X2WoxaE4dD1xxcswTY7qTOf6HRiaTkdV1Ow/slXsxc=; b=PYXByIFCnYdD51wDQJsLJ/CHDNo5Kr/N/GZJB1sPbC/C74LM/CH0/JMh7T0p9q9OkT rt7s6c4eIRiTjOUl6B0Ulm9ZO8iXKprlIqZ9MZteyhwtE49vz4QW7kj4WMESwAp+nbvu ejNE9+mSAI+6qB4Q8Iq6J3H+OQO/AZ1xkMheEQRI2pm+dd+pZqfkbYTY9v+Ui6p2ez5Q qs2FRbaO6U9ISSPBS7I2qpCS+CIDmc3pbbOVquf2IL8BJ+rhhp9rqRxV+yHVeqPbhYpD 7MoagHHERN1Rsh4oN8/ROvh+11p0FyNBv2EpSvooTbKmTMuBo5kS2nu72b5pI/Nmdccn R1EA== 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=8X2WoxaE4dD1xxcswTY7qTOf6HRiaTkdV1Ow/slXsxc=; b=awd4v5WNhjcoJ+lMqKZXrw9hO/IBOG+CfLIMpJzOZPFGkP4CnhjKg8Oyd4xU07VY6s Do5spU5A1JQNXA7k233Jkkl2Q3ZkBL/AqdY/f0QvAFWFimeQsUTWIjaHz5y871EjYk5K 42pwKCbQAlWy/WsR+4SlhNqA4XQ++LM7Csgbzozm33iSjlELSS8ep/YQKMgqGo1RaQCP sO/AMhV5OJvuTMp9sS7vEf0/r7c7mQMF9DJ0MfL1aee68U95dyhnGLfBGTwJMdEwQ+wu XoxGgfUzyuswFmQqRXHnSVF4aKiqR2rIQwSQm4ng1rzAH3geoIqFIGiU7TT4nzz5r3EY kA4Q== X-Gm-Message-State: AOAM533Vw/6ZkSdtyP1VgaFCkJmKRQ/CY9SbnCX4+MurZObLx/ySEQan DA+o+sLRerJMFkmOkHmGdrB1ZswDbieXDNym X-Received: by 2002:a1c:1f54:: with SMTP id f81mr27766418wmf.121.1624292962481; Mon, 21 Jun 2021 09:29:22 -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.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 09:29:22 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 54/57] target/arm: Implement MVE VADDV Date: Mon, 21 Jun 2021 17:28:30 +0100 Message-Id: <20210621162833.32535-55-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::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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 VADDV insn, which performs an addition across vector lanes. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20210617121628.20116-44-peter.maydell@linaro.org --- target/arm/helper-mve.h | 7 +++++++ target/arm/mve.decode | 2 ++ target/arm/mve_helper.c | 24 +++++++++++++++++++++ target/arm/translate-mve.c | 43 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) -- 2.20.1 diff --git a/target/arm/helper-mve.h b/target/arm/helper-mve.h index 161308b67e6..4bbb9b3ae2c 100644 --- a/target/arm/helper-mve.h +++ b/target/arm/helper-mve.h @@ -348,3 +348,10 @@ DEF_HELPER_FLAGS_4(mve_vrmlaldavhuw, TCG_CALL_NO_WG, i64, env, ptr, ptr, i64) DEF_HELPER_FLAGS_4(mve_vrmlsldavhsw, TCG_CALL_NO_WG, i64, env, ptr, ptr, i64) DEF_HELPER_FLAGS_4(mve_vrmlsldavhxsw, TCG_CALL_NO_WG, i64, env, ptr, ptr, i64) + +DEF_HELPER_FLAGS_3(mve_vaddvsb, TCG_CALL_NO_WG, i32, env, ptr, i32) +DEF_HELPER_FLAGS_3(mve_vaddvub, TCG_CALL_NO_WG, i32, env, ptr, i32) +DEF_HELPER_FLAGS_3(mve_vaddvsh, TCG_CALL_NO_WG, i32, env, ptr, i32) +DEF_HELPER_FLAGS_3(mve_vaddvuh, TCG_CALL_NO_WG, i32, env, ptr, i32) +DEF_HELPER_FLAGS_3(mve_vaddvsw, TCG_CALL_NO_WG, i32, env, ptr, i32) +DEF_HELPER_FLAGS_3(mve_vaddvuw, TCG_CALL_NO_WG, i32, env, ptr, i32) diff --git a/target/arm/mve.decode b/target/arm/mve.decode index 695097dcca4..d9ece7be5da 100644 --- a/target/arm/mve.decode +++ b/target/arm/mve.decode @@ -252,6 +252,8 @@ VBRSR 1111 1110 0 . .. ... 1 ... 1 1110 . 110 .... @2scalar VQDMULH_scalar 1110 1110 0 . .. ... 1 ... 0 1110 . 110 .... @2scalar VQRDMULH_scalar 1111 1110 0 . .. ... 1 ... 0 1110 . 110 .... @2scalar +# Vector add across vector +VADDV 111 u:1 1110 1111 size:2 01 ... 0 1111 0 0 a:1 0 qm:3 0 rda=%rdalo # Predicate operations %mask_22_13 22:1 13:3 diff --git a/target/arm/mve_helper.c b/target/arm/mve_helper.c index 9839d3e64a3..81534f6166b 100644 --- a/target/arm/mve_helper.c +++ b/target/arm/mve_helper.c @@ -1134,3 +1134,27 @@ DO_LDAVH(vrmlaldavhuw, 4, uint32_t, false, int128_add, int128_add, int128_make64 DO_LDAVH(vrmlsldavhsw, 4, int32_t, false, int128_add, int128_sub, int128_makes64) DO_LDAVH(vrmlsldavhxsw, 4, int32_t, true, int128_add, int128_sub, int128_makes64) + +/* Vector add across vector */ +#define DO_VADDV(OP, ESIZE, TYPE) \ + uint32_t HELPER(glue(mve_, OP))(CPUARMState *env, void *vm, \ + uint32_t ra) \ + { \ + uint16_t mask = mve_element_mask(env); \ + unsigned e; \ + TYPE *m = vm; \ + for (e = 0; e < 16 / ESIZE; e++, mask >>= ESIZE) { \ + if (mask & 1) { \ + ra += m[H##ESIZE(e)]; \ + } \ + } \ + mve_advance_vpt(env); \ + return ra; \ + } \ + +DO_VADDV(vaddvsb, 1, uint8_t) +DO_VADDV(vaddvsh, 2, uint16_t) +DO_VADDV(vaddvsw, 4, uint32_t) +DO_VADDV(vaddvub, 1, uint8_t) +DO_VADDV(vaddvuh, 2, uint16_t) +DO_VADDV(vaddvuw, 4, uint32_t) diff --git a/target/arm/translate-mve.c b/target/arm/translate-mve.c index 73c15f41333..04d84e88461 100644 --- a/target/arm/translate-mve.c +++ b/target/arm/translate-mve.c @@ -33,6 +33,7 @@ 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); +typedef void MVEGenVADDVFn(TCGv_i32, TCGv_ptr, TCGv_ptr, TCGv_i32); /* Return the offset of a Qn register (same semantics as aa32_vfp_qreg()) */ static inline long mve_qreg_offset(unsigned reg) @@ -743,3 +744,45 @@ static bool trans_VPST(DisasContext *s, arg_VPST *a) mve_update_and_store_eci(s); return true; } + +static bool trans_VADDV(DisasContext *s, arg_VADDV *a) +{ + /* VADDV: vector add across vector */ + static MVEGenVADDVFn * const fns[4][2] = { + { gen_helper_mve_vaddvsb, gen_helper_mve_vaddvub }, + { gen_helper_mve_vaddvsh, gen_helper_mve_vaddvuh }, + { gen_helper_mve_vaddvsw, gen_helper_mve_vaddvuw }, + { NULL, NULL } + }; + TCGv_ptr qm; + TCGv_i32 rda; + + if (!dc_isar_feature(aa32_mve, s) || + a->size == 3) { + return false; + } + if (!mve_eci_check(s) || !vfp_access_check(s)) { + return true; + } + + /* + * This insn is subject to beat-wise execution. Partial execution + * of an A=0 (no-accumulate) insn which does not execute the first + * beat must start with the current value of Rda, not zero. + */ + if (a->a || mve_skip_first_beat(s)) { + /* Accumulate input from Rda */ + rda = load_reg(s, a->rda); + } else { + /* Accumulate starting at zero */ + rda = tcg_const_i32(0); + } + + qm = mve_qreg_ptr(a->qm); + fns[a->size][a->u](rda, cpu_env, qm, rda); + store_reg(s, a->rda, rda); + tcg_temp_free_ptr(qm); + + mve_update_eci(s); + return true; +}