From patchwork Tue Jun 28 04:20:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 585490 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp429625mab; Mon, 27 Jun 2022 22:12:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1urEcYdCHskunIfdnsIy7UFtFYpXUznWFQg43wm6h1OZ2MdiYy9h3rOPr8OdfEJAwqjPlu9 X-Received: by 2002:a05:620a:10b8:b0:6af:5c4:bcda with SMTP id h24-20020a05620a10b800b006af05c4bcdamr10818912qkk.652.1656393121329; Mon, 27 Jun 2022 22:12:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656393121; cv=none; d=google.com; s=arc-20160816; b=Y7ZUbmjgMbK3XsN9MlLOZS7SGZEdNhZtPiTlm3biPtdsHLMQ3MFwQvGjsCEPX7o7Sn +zqITBhc7c+g+CCmxoebLKdgaO5HtycHOIq3Ynm5VKzZK0kgXvDfUONMZ2AHqJDgE6cd Wd28jRwShqqAmmj0Nma+Z7IyOFr38E0PaM9TQtKkENxQhQT2OPul4ykaLjIthkCK7Bi9 A/RxbwHLysxoqtVXWa/kMM6YDrMZ2jRnQZXHVdD1zcEICYIFiC6gZk4XOmC+9M1SDjp1 WqTsCVzbvNxeyszsQ3AomyxCP0sMHSBrhn/ycEocjVuHe//Ka05Qq65th3x028IjTEOz Gcig== 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:cc:to :from:dkim-signature; bh=jaoQinxUaximkiCoQcc+UCRePY0G4BJDjQPWJn5V2Us=; b=CDHYbPZmwUF/zN/a9tdvVOImYeSQ660655wWXbiOjcaZU8FP/BmpbtcsT/m1RMq2Ve uUmV0eTIGsDQs4qQ+AeHD8+KgbjasTjzzT7NWu7+v+YQVrTa3FLbrq8h0sOCT4kJ+Y28 w4XU4cLmfcRyrXR88H8kFO4V+jT8C2XO3tbjVDtW4/TANvtTczq2moDHBARWr++I5/if +SaD/ZyDj1nOWMPpQfexjzFP7gv7YxMGkpgCnwJ00rWEozRGBHPlvXgIXd2cabfSVUVQ 1jCWQW3j9twDinG+uZgowtyUZnzhbwmmVsQ95Ox6Tnd1T8mP9356LqsGZAC3tBW2HnB0 zF6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zw55OJt2; 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 z2-20020a05620a100200b006af2348ada0si2337224qkj.406.2022.06.27.22.12.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 22:12: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=zw55OJt2; 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]:35242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o63W4-0004Ah-M8 for patch@linaro.org; Tue, 28 Jun 2022 01:12:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o62k8-0002KZ-0Y for qemu-devel@nongnu.org; Tue, 28 Jun 2022 00:22:28 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:41679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o62k5-0003nj-PG for qemu-devel@nongnu.org; Tue, 28 Jun 2022 00:22:27 -0400 Received: by mail-pf1-x42f.google.com with SMTP id i64so10876758pfc.8 for ; Mon, 27 Jun 2022 21:22:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jaoQinxUaximkiCoQcc+UCRePY0G4BJDjQPWJn5V2Us=; b=zw55OJt2BihFiphDe/Z2gaV4hB6htx3vFjuaas04x2wh969T7ss4f8WBe4L+BlIMcb MqCzJDXESjd+BHZoCzjlz7ZTRPHopCv/LR2FokgewLycw+7AoN2yVZPjIW6phaxbWzRV xPKXU+ppWJjUkqCE5G0o1J/cft9HjISVF8++lmT2hZ7l+Iwj/ufg0F+3jsJRan0+PxIF RqT3UQKtj6LJcJ8phcyiiHqmkxQc4hq+j8AvxDMvIAODydcwLcY7Z189AfYZEcx97CuJ A3uBju3tVKA1+YfYeAAzdXlPZj6J7gjpI4dA0MDkk/Rqb3hD0UDnvGwBZrY/fQ7WPnm8 glQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jaoQinxUaximkiCoQcc+UCRePY0G4BJDjQPWJn5V2Us=; b=wskvYJ6PzOolog4usbm1EqNW7/PxBBbMWOJyf3XHQ5dBb1W4jSyOGUqRwJ3QQll8OM fTXwF/BdNbMwHDtCeyO/gNZOVZ1kv2psF7Fyq9oigfPTApLp0a0RS6HLpKeepikbx9AJ dR+mB4Vo9VC0VP4ic42l4jdQCgvvkweUoBNKw3Fz+b3AlWxhMoTXpEvuvtxPrBn45jJ3 394ayVYKccrSZiK8ZUROdu8LwX7c+2g7Tyz/7QQIOY80sD3uGaOt2bimTBsBLggLE3e+ D/o4AVp/cRsKHc+fSmRbW1IwUa+nAJw++jhxTkvI028g2YdyguwWfRyfm9KjTfNRYaHi J7ng== X-Gm-Message-State: AJIora9A1C3aattXyV9YOV3SWqar9BZJgRtF/Sy9BuJ+1wqw63Em5vNG DFxqfhDmRmd3l366J0ov+N62LIqn2nGxvA== X-Received: by 2002:a63:36cc:0:b0:40c:5301:7fe2 with SMTP id d195-20020a6336cc000000b0040c53017fe2mr15472584pga.547.1656390143786; Mon, 27 Jun 2022 21:22:23 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id jg6-20020a17090326c600b0016a087cfad8sm7994929plb.264.2022.06.27.21.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 21:22:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v4 26/45] target/arm: Implement FMOPA, FMOPS (widening) Date: Tue, 28 Jun 2022 09:50:58 +0530 Message-Id: <20220628042117.368549-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220628042117.368549-1-richard.henderson@linaro.org> References: <20220628042117.368549-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" Signed-off-by: Richard Henderson --- target/arm/helper-sme.h | 2 ++ target/arm/sme.decode | 1 + target/arm/sme_helper.c | 68 ++++++++++++++++++++++++++++++++++++++ target/arm/translate-sme.c | 1 + 4 files changed, 72 insertions(+) diff --git a/target/arm/helper-sme.h b/target/arm/helper-sme.h index 1d68fb8c74..4d5d05db3a 100644 --- a/target/arm/helper-sme.h +++ b/target/arm/helper-sme.h @@ -121,6 +121,8 @@ DEF_HELPER_FLAGS_5(sme_addva_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_5(sme_addha_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_5(sme_addva_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_7(sme_fmopa_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_7(sme_fmopa_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_7(sme_fmopa_d, TCG_CALL_NO_RWG, diff --git a/target/arm/sme.decode b/target/arm/sme.decode index afd9c0dffd..e8d27fd8a0 100644 --- a/target/arm/sme.decode +++ b/target/arm/sme.decode @@ -75,3 +75,4 @@ FMOPA_s 10000000 100 ..... ... ... ..... . 00 .. @op_32 FMOPA_d 10000000 110 ..... ... ... ..... . 0 ... @op_64 BFMOPA 10000001 100 ..... ... ... ..... . 00 .. @op_32 +FMOPA_h 10000001 101 ..... ... ... ..... . 00 .. @op_32 diff --git a/target/arm/sme_helper.c b/target/arm/sme_helper.c index d2e1057124..39d630a91c 100644 --- a/target/arm/sme_helper.c +++ b/target/arm/sme_helper.c @@ -978,6 +978,74 @@ static inline uint32_t f16mop_adj_pair(uint32_t pair, uint32_t pg, uint32_t neg) return pair; } +static float32 f16_dotadd(float32 sum, uint32_t e1, uint32_t e2, + float_status *s_std, float_status *s_odd) +{ + float64 e1r = float16_to_float64(e1 & 0xffff, true, s_std); + float64 e1c = float16_to_float64(e1 >> 16, true, s_std); + float64 e2r = float16_to_float64(e2 & 0xffff, true, s_std); + float64 e2c = float16_to_float64(e2 >> 16, true, s_std); + float64 t64; + float32 t32; + + /* + * The ARM pseudocode function FPDot performs both multiplies + * and the add with a single rounding operation. Emulate this + * by performing the first multiply in round-to-odd, then doing + * the second multiply as fused multiply-add, and rounding to + * float32 all in one step. + */ + t64 = float64_mul(e1r, e2r, s_odd); + t64 = float64r32_muladd(e1c, e2c, t64, 0, s_std); + + /* This conversion is exact, because we've already rounded. */ + t32 = float64_to_float32(t64, s_std); + + /* The final accumulation step is not fused. */ + return float32_add(sum, t32, s_std); +} + +void HELPER(sme_fmopa_h)(void *vza, void *vzn, void *vzm, void *vpn, + void *vpm, void *vst, uint32_t desc) +{ + intptr_t row, col, oprsz = simd_maxsz(desc); + uint32_t neg = simd_data(desc) << 15; + uint16_t *pn = vpn, *pm = vpm; + float_status fpst_odd, fpst_std = *(float_status *)vst; + + set_default_nan_mode(true, &fpst_std); + fpst_odd = fpst_std; + set_float_rounding_mode(float_round_to_odd, &fpst_odd); + + for (row = 0; row < oprsz; ) { + uint16_t pa = pn[H2(row >> 4)]; + do { + void *vza_row = vza + row * sizeof(ARMVectorReg); + uint32_t n = *(uint32_t *)(vzn + row); + + n = f16mop_adj_pair(n, pa, neg); + + for (col = 0; col < oprsz; ) { + uint16_t pb = pm[H2(col >> 4)]; + do { + if ((pa & 0b0101) == 0b0101 || (pb & 0b0101) == 0b0101) { + uint32_t *a = vza_row + col; + uint32_t m = *(uint32_t *)(vzm + col); + + m = f16mop_adj_pair(m, pb, neg); + *a = f16_dotadd(*a, n, m, &fpst_std, &fpst_odd); + + col += 4; + pb >>= 4; + } + } while (col & 15); + } + row += 4; + pa >>= 4; + } while (row & 15); + } +} + void HELPER(sme_bfmopa)(void *vza, void *vzn, void *vzm, void *vpn, void *vpm, uint32_t desc) { diff --git a/target/arm/translate-sme.c b/target/arm/translate-sme.c index e537a14b6d..0fcb33cb3f 100644 --- a/target/arm/translate-sme.c +++ b/target/arm/translate-sme.c @@ -358,6 +358,7 @@ static bool do_outprod_fpst(DisasContext *s, arg_op *a, MemOp esz, return true; } +TRANS_FEAT(FMOPA_h, aa64_sme, do_outprod_fpst, a, MO_32, gen_helper_sme_fmopa_h) TRANS_FEAT(FMOPA_s, aa64_sme, do_outprod_fpst, a, MO_32, gen_helper_sme_fmopa_s) TRANS_FEAT(FMOPA_d, aa64_sme_f64f64, do_outprod_fpst, a, MO_64, gen_helper_sme_fmopa_d)