From patchwork Mon Jun 21 16:28:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 464566 Delivered-To: patch@linaro.org Received: by 2002:a17:906:71d0:0:0:0:0 with SMTP id i16csp4380538ejk; Mon, 21 Jun 2021 09:50:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0SYwAdyNQJ43n8p5ZQwPGspwU/f6Nu7Ranf+Pjbb4Hhohgta1lAtnU+9MZ5ECLjC2etxB X-Received: by 2002:a9f:2427:: with SMTP id 36mr13521714uaq.35.1624294249611; Mon, 21 Jun 2021 09:50:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624294249; cv=none; d=google.com; s=arc-20160816; b=B1M2631HNqWIYZpL/2wl2c5scEh81gqfg5vzMywJ/4TtfSkwDX+VY7Xi8T+iD9t6OJ NO4NhGtkCoxkMiSMgBODD6V1BeBJqwkMbF1kBZw6lqzaQHF+kItAoCSmAaKRUZflTqek kyPdUJj/bTr0aRIrQungAFqE0r6Vmlrmd+JWeufslQUiPydXcAYdqytYbQyUzUL9+7OW cbhiJSLpBrCsTgKBCq+hWM/Ip4dwCgT65XLrZNaeeQ5iOl52VUuVxlxliQ+moYIWucc7 Rmjnp31bF5S+Xrgw3B8UaTVwdxBY7jg1dZM4AiEUi/USc+nV5+Ctazebi2hvjKULEyf9 pT1Q== 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=4cOBzM0JMvxA9laWtZby8J2j2taQBU/xgd6dJqObAN4=; b=F3g9enYSBPTfk2YGA8pD6FElzFhZyWGBXLUWUt6LSjj7K3XSBfthQHr+VpJSWi4Sdo 4Euc0QHFuhuH2fZ0qVxnTXL3E734Cu8TD9h5Ks5FI2WU9CRCxVCreKWTK0+SD88kScuc WthrwLnSb9cfhkL5fz9z2H9xD6MqVTkwmSOe7lJjp878YzI2TTzqns8IngWw14sYmEjF xr4HXkBZKy6A4sY9mVplX4pzaRccqT+9ZY03+W9zE2dnuyUEREVEbnxct23Hv3FKu0OB ALubcG9bhZw4TBw0X4U+7Y7TJLce9uS3wy+z3e0CStd7v39LJxr3Ldg3x363EXdqDLhf 68ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zMgrXlMB; 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 d4si1469145vsf.434.2021.06.21.09.50.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jun 2021 09:50:49 -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=zMgrXlMB; 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]:39216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvN8K-0005nn-Ry for patch@linaro.org; Mon, 21 Jun 2021 12:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvMnR-0007TN-6m for qemu-devel@nongnu.org; Mon, 21 Jun 2021 12:29:13 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:53786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvMnN-0007g2-Pk for qemu-devel@nongnu.org; Mon, 21 Jun 2021 12:29:12 -0400 Received: by mail-wm1-x332.google.com with SMTP id w13so4317521wmc.3 for ; Mon, 21 Jun 2021 09:29:09 -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=4cOBzM0JMvxA9laWtZby8J2j2taQBU/xgd6dJqObAN4=; b=zMgrXlMBVIVfA2Fo22syE4CiPawv33NdbUzk7V3P5NemCPOoV6mewqmWsbN9XiwvxH mVMC0DjQygGkTTFH5rM+or5JeUdekEg2HdWW3NNiR4ua2Iw+wWFud1y9G1Uc1Bsjay0k fD3Eucgm+i1BcqTbQeSQsLtUnZnkcsI6LG87h3zqKtYz9u/OhGOoIiKoCbOAg6Qw3MbU nNqduolKzYN7PMaS0qYB424n+Nay6iEOxpwHyhieY245YN9mjtX5avI5oQbsAPh8OTn4 I4Drs0sXQ9RGnc6mwO4MN4rGyPMZXqPCNE2ZTDHxx7a5of+nLXIqzoY5KZqOQFRC0g3o XsQQ== 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=4cOBzM0JMvxA9laWtZby8J2j2taQBU/xgd6dJqObAN4=; b=WFquZYdQUu8qZGuCIC3H4kZ6N9F9vgMlINJqXnmzZKeMuNtWrYlMWZxfC3cSpNmzhj 6gCIhcH3BvESvx97zXLU8pQTAuYBLuCplJgQG25KXB9Zp/Tc7yewr//lyQLRmobO03zf Y0AF35gXfLFdKqya+VBdHMIMRqsqWJvDg96AVkaelblqpOE48hWFD42nK+GJjQw+acjp 5sJkNzqRmGYmAMuvYpH6RfOQDy5iqzVEUq4b3dru6xIUEI8dU5uanBcYkBSW9OpY+rtQ uWXP+ueSFutdBdRfiBg4cAwQSBUjhWiCO3oZVweNM3DrQZYQR+VeCZP1ITSachx+Ardf 8ZDA== X-Gm-Message-State: AOAM531DhyGww7V1Xxw0QnDPXvgI/ajChjB5Eq/M3T7vwhBpDUP38GTa Cea+3WWP4U1BdEIICO/WTrDEerDys0GYKeE2 X-Received: by 2002:a05:600c:35c1:: with SMTP id r1mr27679025wmq.13.1624292948494; Mon, 21 Jun 2021 09:29:08 -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.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 09:29:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 35/57] target/arm: Implement MVE VHADD, VHSUB (scalar) Date: Mon, 21 Jun 2021 17:28:11 +0100 Message-Id: <20210621162833.32535-36-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::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.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 scalar variants of the MVE VHADD and VHSUB insns. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20210617121628.20116-25-peter.maydell@linaro.org --- target/arm/helper-mve.h | 16 ++++++++++++++++ target/arm/mve.decode | 4 ++++ target/arm/mve_helper.c | 8 ++++++++ target/arm/translate-mve.c | 4 ++++ 4 files changed, 32 insertions(+) -- 2.20.1 diff --git a/target/arm/helper-mve.h b/target/arm/helper-mve.h index 912505d0152..52086d769f4 100644 --- a/target/arm/helper-mve.h +++ b/target/arm/helper-mve.h @@ -157,6 +157,22 @@ DEF_HELPER_FLAGS_4(mve_vmul_scalarb, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) DEF_HELPER_FLAGS_4(mve_vmul_scalarh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) DEF_HELPER_FLAGS_4(mve_vmul_scalarw, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vhadds_scalarb, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vhadds_scalarh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vhadds_scalarw, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) + +DEF_HELPER_FLAGS_4(mve_vhaddu_scalarb, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vhaddu_scalarh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vhaddu_scalarw, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) + +DEF_HELPER_FLAGS_4(mve_vhsubs_scalarb, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vhsubs_scalarh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vhsubs_scalarw, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) + +DEF_HELPER_FLAGS_4(mve_vhsubu_scalarb, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vhsubu_scalarh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(mve_vhsubu_scalarw, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) + DEF_HELPER_FLAGS_4(mve_vmlaldavsh, TCG_CALL_NO_WG, i64, env, ptr, ptr, i64) DEF_HELPER_FLAGS_4(mve_vmlaldavsw, TCG_CALL_NO_WG, i64, env, ptr, ptr, i64) DEF_HELPER_FLAGS_4(mve_vmlaldavxsh, TCG_CALL_NO_WG, i64, env, ptr, ptr, i64) diff --git a/target/arm/mve.decode b/target/arm/mve.decode index af5fba78ce2..5c332b04a7c 100644 --- a/target/arm/mve.decode +++ b/target/arm/mve.decode @@ -163,3 +163,7 @@ VRMLSLDAVH 1111 1110 1 ... ... 0 ... x:1 1110 . 0 a:1 0 ... 1 @vmlaldav_no VADD_scalar 1110 1110 0 . .. ... 1 ... 0 1111 . 100 .... @2scalar VSUB_scalar 1110 1110 0 . .. ... 1 ... 1 1111 . 100 .... @2scalar VMUL_scalar 1110 1110 0 . .. ... 1 ... 1 1110 . 110 .... @2scalar +VHADD_S_scalar 1110 1110 0 . .. ... 0 ... 0 1111 . 100 .... @2scalar +VHADD_U_scalar 1111 1110 0 . .. ... 0 ... 0 1111 . 100 .... @2scalar +VHSUB_S_scalar 1110 1110 0 . .. ... 0 ... 1 1111 . 100 .... @2scalar +VHSUB_U_scalar 1111 1110 0 . .. ... 0 ... 1 1111 . 100 .... @2scalar diff --git a/target/arm/mve_helper.c b/target/arm/mve_helper.c index 3c62627f2c7..096f7a39dac 100644 --- a/target/arm/mve_helper.c +++ b/target/arm/mve_helper.c @@ -510,10 +510,18 @@ DO_2OP_U(vhsubu, do_vhsub_u) DO_2OP_SCALAR(OP##b, 1, uint8_t, FN) \ DO_2OP_SCALAR(OP##h, 2, uint16_t, FN) \ DO_2OP_SCALAR(OP##w, 4, uint32_t, FN) +#define DO_2OP_SCALAR_S(OP, FN) \ + DO_2OP_SCALAR(OP##b, 1, int8_t, FN) \ + DO_2OP_SCALAR(OP##h, 2, int16_t, FN) \ + DO_2OP_SCALAR(OP##w, 4, int32_t, FN) DO_2OP_SCALAR_U(vadd_scalar, DO_ADD) DO_2OP_SCALAR_U(vsub_scalar, DO_SUB) DO_2OP_SCALAR_U(vmul_scalar, DO_MUL) +DO_2OP_SCALAR_S(vhadds_scalar, do_vhadd_s) +DO_2OP_SCALAR_U(vhaddu_scalar, do_vhadd_u) +DO_2OP_SCALAR_S(vhsubs_scalar, do_vhsub_s) +DO_2OP_SCALAR_U(vhsubu_scalar, do_vhsub_u) /* * Multiply add long dual accumulate ops. diff --git a/target/arm/translate-mve.c b/target/arm/translate-mve.c index 3c059ad91cd..4b379bfe6e4 100644 --- a/target/arm/translate-mve.c +++ b/target/arm/translate-mve.c @@ -429,6 +429,10 @@ static bool do_2op_scalar(DisasContext *s, arg_2scalar *a, DO_2OP_SCALAR(VADD_scalar, vadd_scalar) DO_2OP_SCALAR(VSUB_scalar, vsub_scalar) DO_2OP_SCALAR(VMUL_scalar, vmul_scalar) +DO_2OP_SCALAR(VHADD_S_scalar, vhadds_scalar) +DO_2OP_SCALAR(VHADD_U_scalar, vhaddu_scalar) +DO_2OP_SCALAR(VHSUB_S_scalar, vhsubs_scalar) +DO_2OP_SCALAR(VHSUB_U_scalar, vhsubu_scalar) static bool do_long_dual_acc(DisasContext *s, arg_vmlaldav *a, MVEGenDualAccOpFn *fn)