From patchwork Fri Jul 8 15:15:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 588544 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:bb16:0:0:0:0 with SMTP id jd22csp777912mab; Fri, 8 Jul 2022 08:47:41 -0700 (PDT) X-Google-Smtp-Source: AGRyM1upOqgZL4uDGLMbXwqGaP7iZq8vVD044HoRcsIEQXjvX04lKBy48JMzqHSHgtNmtLHBg6tY X-Received: by 2002:a05:620a:1a0b:b0:6af:33c1:1e4 with SMTP id bk11-20020a05620a1a0b00b006af33c101e4mr2823364qkb.377.1657295261775; Fri, 08 Jul 2022 08:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657295261; cv=none; d=google.com; s=arc-20160816; b=IUhj8EP3n2IYFa0ZkEFHjaQ/Ia4ncwd0jrSBsw+EKXHfaJ3eofEfdvsoaXrG8BHTjQ 6PaFwc5NzwRhmo4VxWQhCJL4NZFZr824QmE7FuA1ka+HL65G2aRWrLdtjfg2ir+E4VkW SBDrj0tmxf4ZfkN0supL/eSzTLZTEKE1YLiv7SWo3bhyCQ6JYHVW9kRrQkin9JEy8kit uMrY4pkC2RXlARMyxmxOPp6YorYID0ZvmVwH2dmgUoxIzB1q65rCRtxLFzDdeQpG/HQ5 BCjyv0wYyYwiZ6R0UBAv7PKvNpVaHKX5HXcYfg9ZO+uI1+YPI0HVbtq0TzkpUNU+t13C NWCQ== 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=7Tjb6G7GkMTZZUt4ovJR0VSSVW2JTCjNpncEMG03Rtw=; b=ANlcXw96gcebCf2OQKxrk9RD53EK9ptjDuu24FjeWGmd77MhGS5dXQtf9x0hcfqw0D MDnMJvZaQlmo77CrA2HME4SFu5R8lCo5nCLUU9e6cYvxtWH6G5gFIWya7FWXkuYIzalc EnI5e6shGkqpFwsvF6e1nfg4Djc0U6oV3Inh4yjzSIMNV/EDvYNj22NnXk+FIL0yljau y39Pgzgoa/lZ23RT5hsyBAU9WSmSuGnaAujHlWcVrHlKnO5pzkaEvm+HrY7rrg5rLzYO kbQjXQbneGyN3OZJPgnzYPwn8Uz0YbImFz5L1TMx9RkN8Cja/7Td7KSoYfebz5n2oSvb nyOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cqFqUYu+; 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 g4-20020a0562141cc400b00472f2f4349bsi9746652qvd.338.2022.07.08.08.47.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jul 2022 08:47:41 -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=cqFqUYu+; 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]:43830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9qCj-0002iX-9M for patch@linaro.org; Fri, 08 Jul 2022 11:47:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9pjA-0003sQ-Kn for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:17:08 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:43563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9pj8-0002Or-Qy for qemu-devel@nongnu.org; Fri, 08 Jul 2022 11:17:08 -0400 Received: by mail-pf1-x42f.google.com with SMTP id b9so7753039pfp.10 for ; Fri, 08 Jul 2022 08:17:06 -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=7Tjb6G7GkMTZZUt4ovJR0VSSVW2JTCjNpncEMG03Rtw=; b=cqFqUYu+HWdWXKqPRz6P26S+cmH7vGsoz6RpchOMee/By1Z6+RzVG5NlzBpycmk2dv PY0i6bs/Xx/CDLDL+DbB37sdwjwiUXw3rrEYjDPvXDPNVIP6kBG+1VIK3Yhs/BhVjapk kIZRrGxeWKFir+5kf1k+m5BU6UoPkA/irsQxbcKULVcndv1Pm2dZIh0SxaVAGrrIxpDQ v72sTQ4dqqPZcIPJ/mfbc1aAi0d81Ot56knH1fyCIIG7ouz3qunta/ERc7GRfD9uVsx6 WbbJACrl2cFfGfhc3BkkiKPm/ZZ59aJWZwF7Ztah7hk874X0wBbbXpnctgoyNOlIp9ri zG7g== 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=7Tjb6G7GkMTZZUt4ovJR0VSSVW2JTCjNpncEMG03Rtw=; b=t93DQsTA5EsphBBPfSyDhTzHS6+hYgge+X4vWT0ZBB+7Mh39Zjv4puIEBKVOwE7hjJ 7+IKY/VgPiQpqRwuXFqH4ygFxyFUeeGAzEdeTpJDwA8sKxdWUjlDI1N6OWeC2TmZ/JYE ZdxJbgmcM1QFDn2Qlu9i/JK8fU5pcI5PzG2HHaedABs0EQhG0dnROlwjTeujAzQgRlEj ASAHP1C4x4T6sJCib1NJJS8obXaHJ/Knya/4ekXbIn4oHEW4HZktAwJFapO29IuPap19 UahmBflxK8yB479rPUeylFQpLhVQSNAYFE7HRclitnbEEN9G1EbUUx7+ewJoS2pTTQ7Y 4K9w== X-Gm-Message-State: AJIora+o1mO4vU5O0aHvk6e43PgxcrDqCrUMqWOPwPSH4JQjt+3gc1mu awqm/G0EuAP3cYZDn/g5rUNWjpmz94K3KLpK X-Received: by 2002:a05:6a00:21c8:b0:4fd:f89f:ec0e with SMTP id t8-20020a056a0021c800b004fdf89fec0emr4275233pfj.83.1657293425510; Fri, 08 Jul 2022 08:17:05 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id n17-20020a056a0007d100b0051bada81bc7sm29085774pfu.161.2022.07.08.08.17.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 08:17:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v6 26/45] target/arm: Implement FMOPA, FMOPS (widening) Date: Fri, 8 Jul 2022 20:45:21 +0530 Message-Id: <20220708151540.18136-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220708151540.18136-1-richard.henderson@linaro.org> References: <20220708151540.18136-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=ham 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 | 74 ++++++++++++++++++++++++++++++++++++++ target/arm/translate-sme.c | 1 + 4 files changed, 78 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 690a53eee2..302f89c30b 100644 --- a/target/arm/sme_helper.c +++ b/target/arm/sme_helper.c @@ -1008,6 +1008,80 @@ 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) * 0x80008000u; + uint16_t *pn = vpn, *pm = vpm; + float_status fpst_odd, fpst_std; + + /* + * Make a copy of float_status because this operation does not + * update the cumulative fp exception status. It also produces + * default nans. Make a second copy with round-to-odd -- see above. + */ + 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 prow = pn[H2(row >> 4)]; + do { + void *vza_row = vza + tile_vslice_offset(row); + uint32_t n = *(uint32_t *)(vzn + H1_4(row)); + + n = f16mop_adj_pair(n, prow, neg); + + for (col = 0; col < oprsz; ) { + uint16_t pcol = pm[H2(col >> 4)]; + do { + if (prow & pcol & 0b0101) { + uint32_t *a = vza_row + H1_4(col); + uint32_t m = *(uint32_t *)(vzm + H1_4(col)); + + m = f16mop_adj_pair(m, pcol, 0); + *a = f16_dotadd(*a, n, m, &fpst_std, &fpst_odd); + + col += 4; + pcol >>= 4; + } + } while (col & 15); + } + row += 4; + prow >>= 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 ecb7583c55..c2953b22ce 100644 --- a/target/arm/translate-sme.c +++ b/target/arm/translate-sme.c @@ -355,6 +355,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)