From patchwork Thu Jul 29 11:14:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 488670 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp2068378jas; Thu, 29 Jul 2021 04:23:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoBVl8YOabqRpXp1zQTm+83RyXebw9dgHFk62D+15pbOtnT7Abp8rA8vRA3nsJ+RHZAKFY X-Received: by 2002:a05:6e02:1c02:: with SMTP id l2mr3358300ilh.9.1627557806603; Thu, 29 Jul 2021 04:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627557806; cv=none; d=google.com; s=arc-20160816; b=xgmq22oWIzOc7nqqgdKgKzv9YC2iJ/iqiOX0VoV9QjSCakNT4I4bcppCw15fPldIDH PokhGyGSPcuTfsAV8RUx0QqcjvHJgpBSrIjYgST1R28L6UKUZj9rR1+CEqzEJSO7wgbP MqB8mERBw1xwINSXeyLUj7eO4UbLTDyxkp6Lbo0RsOKqP8dhmpCtSHYqndvzh8LSav3U 8t4Lm4mrrutr/uJKmpcLp2l2r+k9Sc05jfWGo4XyM9672TR6o3ogYOzFJnZeEhJxQfqG gaXn6GrCCqkts3RCo/LHS2SKpembn7//m2I5rLUrSpwcEOb/FH/ZVAAFBKm+bvIzmzdp JT0A== 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=wLBDTVo8uPxsFMze+DTZAhzyPrmDpywm7k5ga1QcofA=; b=Ev80K/J1cwbLcLARrdvVINqHOikr/Dfth4nFNGdRFlaKfItDvaS1HWfhvUFH3lbg13 NwP6HoOOqnZyMm/Stnva7EtyEF0joJkXf9Ln44xYfkpmJBztcn5KELjNW9MgvWGvUWAl eLEzZd/K8pHrcHfLmzm3T0MlfvMha7fnI5YZr+X0WwBjlF/RR8yeGXq+wubB7m/v5DRQ H7b0TNJ0OK4TVOio5eYbDz4mrSv6vBv6+FdpRUzvibqf4PzHkJ6ZO6PCnvd6AtYIN2jF 67G+09pKB4dBBE3m/Die+FR+8CI1Tq47lI/8+DJcUPCBxmt0mpjY+Ey8kYNwf5UR1zs4 XHOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cz8OiGqN; 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 g17si2941371jaq.116.2021.07.29.04.23.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Jul 2021 04:23:26 -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=Cz8OiGqN; 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]:42488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m948M-0008GA-1d for patch@linaro.org; Thu, 29 Jul 2021 07:23:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9415-0000sP-9N for qemu-devel@nongnu.org; Thu, 29 Jul 2021 07:15:55 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:40658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m940k-0001DF-IE for qemu-devel@nongnu.org; Thu, 29 Jul 2021 07:15:54 -0400 Received: by mail-wm1-x32f.google.com with SMTP id f18-20020a05600c4e92b0290253c32620e7so6334972wmq.5 for ; Thu, 29 Jul 2021 04:15:34 -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=wLBDTVo8uPxsFMze+DTZAhzyPrmDpywm7k5ga1QcofA=; b=Cz8OiGqNYdKuO89rG3X4DMgkrWt+6eQa1VhzC1z3eZw+ifWJkcL90dliz07Gy8gWES HsRTEBONsSvtXn+iUCiwbs2oiX4q4VXfYS7AgxdECut2onxqcfS6ljXFyTzsIJjeJO9h tNNYvnJ6K3dksiM+mPE/MqlRALxixDoYJ4UBR7bpUXuNRCfYLPGmXekJb1dHxB5O0EQz WlBTzfrKk03Gap4kqeZbTAj83xrci1McizG1Xkt/Q1B+3chVqrT13abNi+oV62wMXNB1 42V9AZDvZg4U+IKP4IlcJSfobt9P6EniuXJh9M2dJJoSpKWuDxvfptru6B/U5fVOlcXz uD5Q== 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=wLBDTVo8uPxsFMze+DTZAhzyPrmDpywm7k5ga1QcofA=; b=a7mi4s6dT4FxTemS0mjXKbxDREagW4Wva79m/Y1//ErJuDr0+6RWRv6lun/IorZXVm BDLXct/x/EICM+DoczjrnnYUDgftMO6ULn+xICbOv/wvspBgHEUx3Lq+TN52SBHxHTVW WTnCTkCpZWWbTK18oaYAv1RJwiY1p5y4Ym4iBHS5W6Q7vS7AInk+zdZR+MSwDdxVmLAl QMylq8oXP3ARYDUl3hsi36/8BxZRyx8mEBs2p0x0mNcCM2L7Y2s479l/AD6bpWoOmXLZ xQZlPqRht45iLco1pi6szWDX6H9KUVVnxOR+3DXijgXT4IEzl7FWrbxVsbxQj5xePyaR Hm2Q== X-Gm-Message-State: AOAM5333BoWGu2UtIuS4bTb0xGEr+Vd6lDIyBI3Wv0N5q9iqqVZPmvyV zL7c5dgE1DxQmzSHC2qndCddUQ== X-Received: by 2002:a05:600c:33a6:: with SMTP id o38mr7760134wmp.131.1627557333007; Thu, 29 Jul 2021 04:15:33 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j140sm3037829wmj.37.2021.07.29.04.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 04:15:32 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH for-6.2 22/53] target/arm: Implement MVE VABAV Date: Thu, 29 Jul 2021 12:14:41 +0100 Message-Id: <20210729111512.16541-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210729111512.16541-1-peter.maydell@linaro.org> References: <20210729111512.16541-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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 VABAV insn, which computes absolute differences between elements of two vectors and accumulates the result into a general purpose register. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/helper-mve.h | 7 +++++++ target/arm/mve.decode | 6 ++++++ target/arm/mve_helper.c | 26 +++++++++++++++++++++++ target/arm/translate-mve.c | 43 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+) -- 2.20.1 diff --git a/target/arm/helper-mve.h b/target/arm/helper-mve.h index 2c66fcba792..c7e7aab2cbb 100644 --- a/target/arm/helper-mve.h +++ b/target/arm/helper-mve.h @@ -402,6 +402,13 @@ DEF_HELPER_FLAGS_3(mve_vminavw, TCG_CALL_NO_WG, i32, env, ptr, i32) DEF_HELPER_FLAGS_3(mve_vaddlv_s, TCG_CALL_NO_WG, i64, env, ptr, i64) DEF_HELPER_FLAGS_3(mve_vaddlv_u, TCG_CALL_NO_WG, i64, env, ptr, i64) +DEF_HELPER_FLAGS_4(mve_vabavsb, TCG_CALL_NO_WG, i32, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vabavsh, TCG_CALL_NO_WG, i32, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vabavsw, TCG_CALL_NO_WG, i32, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vabavub, TCG_CALL_NO_WG, i32, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vabavuh, TCG_CALL_NO_WG, i32, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vabavuw, TCG_CALL_NO_WG, i32, env, ptr, ptr, i32) + DEF_HELPER_FLAGS_3(mve_vmovi, TCG_CALL_NO_WG, void, env, ptr, i64) DEF_HELPER_FLAGS_3(mve_vandi, TCG_CALL_NO_WG, void, env, ptr, i64) DEF_HELPER_FLAGS_3(mve_vorri, TCG_CALL_NO_WG, void, env, ptr, i64) diff --git a/target/arm/mve.decode b/target/arm/mve.decode index 83dc0300d69..c8a06edca78 100644 --- a/target/arm/mve.decode +++ b/target/arm/mve.decode @@ -41,6 +41,7 @@ &vcmp_scalar qn rm size mask &shl_scalar qda rm size &vmaxv qm rda size +&vabav qn qm rda 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) @@ -386,6 +387,11 @@ VMLAS 111- 1110 0 . .. ... 1 ... 1 1110 . 100 .... @2scalar rdahi=%rdahi rdalo=%rdalo } +@vabav .... .... .. size:2 .... rda:4 .... .... .... &vabav qn=%qn qm=%qm + +VABAV_S 111 0 1110 10 .. ... 0 .... 1111 . 0 . 0 ... 1 @vabav +VABAV_U 111 1 1110 10 .. ... 0 .... 1111 . 0 . 0 ... 1 @vabav + # Logical immediate operations (1 reg and modified-immediate) # The cmode/op bits here decode VORR/VBIC/VMOV/VMVN, but diff --git a/target/arm/mve_helper.c b/target/arm/mve_helper.c index 924ad7f2bdc..fed0f3cd610 100644 --- a/target/arm/mve_helper.c +++ b/target/arm/mve_helper.c @@ -1320,6 +1320,32 @@ DO_VMAXMINV(vminavb, 1, int8_t, uint8_t, do_mina) DO_VMAXMINV(vminavh, 2, int16_t, uint16_t, do_mina) DO_VMAXMINV(vminavw, 4, int32_t, uint32_t, do_mina) +#define DO_VABAV(OP, ESIZE, TYPE) \ + uint32_t HELPER(glue(mve_, OP))(CPUARMState *env, void *vn, \ + void *vm, uint32_t ra) \ + { \ + uint16_t mask = mve_element_mask(env); \ + unsigned e; \ + TYPE *m = vm, *n = vn; \ + for (e = 0; e < 16 / ESIZE; e++, mask >>= ESIZE) { \ + if (mask & 1) { \ + int64_t n0 = n[H##ESIZE(e)]; \ + int64_t m0 = m[H##ESIZE(e)]; \ + uint32_t r = n0 >= m0 ? (n0 - m0) : (m0 - n0); \ + ra += r; \ + } \ + } \ + mve_advance_vpt(env); \ + return ra; \ + } + +DO_VABAV(vabavsb, 1, int8_t) +DO_VABAV(vabavsh, 2, int16_t) +DO_VABAV(vabavsw, 4, int32_t) +DO_VABAV(vabavub, 1, uint8_t) +DO_VABAV(vabavuh, 2, uint16_t) +DO_VABAV(vabavuw, 4, uint32_t) + #define DO_VADDLV(OP, TYPE, LTYPE) \ uint64_t HELPER(glue(mve_, OP))(CPUARMState *env, void *vm, \ uint64_t ra) \ diff --git a/target/arm/translate-mve.c b/target/arm/translate-mve.c index 2fce74f86ab..247f6719e6f 100644 --- a/target/arm/translate-mve.c +++ b/target/arm/translate-mve.c @@ -45,6 +45,7 @@ typedef void MVEGenVIDUPFn(TCGv_i32, TCGv_ptr, TCGv_ptr, TCGv_i32, TCGv_i32); typedef void MVEGenVIWDUPFn(TCGv_i32, TCGv_ptr, TCGv_ptr, TCGv_i32, TCGv_i32, TCGv_i32); typedef void MVEGenCmpFn(TCGv_ptr, TCGv_ptr, TCGv_ptr); typedef void MVEGenScalarCmpFn(TCGv_ptr, TCGv_ptr, TCGv_i32); +typedef void MVEGenVABAVFn(TCGv_i32, TCGv_ptr, 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) @@ -1369,3 +1370,45 @@ DO_VMAXV(VMAXAV, vmaxav) DO_VMAXV(VMINV_S, vminvs) DO_VMAXV(VMINV_U, vminvu) DO_VMAXV(VMINAV, vminav) + +static bool do_vabav(DisasContext *s, arg_vabav *a, MVEGenVABAVFn *fn) +{ + /* Absolute difference accumulated across vector */ + TCGv_ptr qn, qm; + TCGv_i32 rda; + + if (!dc_isar_feature(aa32_mve, s) || + !mve_check_qreg_bank(s, a->qm | a->qn) || + !fn || a->rda == 13 || a->rda == 15) { + /* Rda cases are UNPREDICTABLE */ + return false; + } + if (!mve_eci_check(s) || !vfp_access_check(s)) { + return true; + } + + qm = mve_qreg_ptr(a->qm); + qn = mve_qreg_ptr(a->qn); + rda = load_reg(s, a->rda); + fn(rda, cpu_env, qn, qm, rda); + store_reg(s, a->rda, rda); + tcg_temp_free_ptr(qm); + tcg_temp_free_ptr(qn); + mve_update_eci(s); + return true; +} + +#define DO_VABAV(INSN, FN) \ + static bool trans_##INSN(DisasContext *s, arg_vabav *a) \ + { \ + static MVEGenVABAVFn * const fns[] = { \ + gen_helper_mve_##FN##b, \ + gen_helper_mve_##FN##h, \ + gen_helper_mve_##FN##w, \ + NULL, \ + }; \ + return do_vabav(s, a, fns[a->size]); \ + } + +DO_VABAV(VABAV_S, vabavs) +DO_VABAV(VABAV_U, vabavu)