From nobody Tue May 5 09:00:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1751646821; cv=none; d=zohomail.com; s=zohoarc; b=l4N8fF/X5SStcXxKe/9/lcnSZQTkvu0D9ydKEKnq+k5s6keFKONnkc4p4zD002+KE6avNEvfYYX2KaQvRuLhXATYXbFv62iLxBciCOoJyu+WbXAXj7yWo4oHHBmfCEPuhvxNROepeyWPE/kC9bsjrch9uVlThWEdcFAHt4lB4Ko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751646821; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=YPrXkwC0VL9BF9YYIho8TZ/yyhMUTGAPJG9+vyynk9Y=; b=GJ52Qqh2bNtq5fOGtyJO6x3dF9LQ/bg6OaW+xIg4bfNWJ0MbPwKKHabPiFByGlcYttiOxe80s97BlVQhaROpMfiFEajTRWI157LQdkVQkZ0hprgEqpHmu7cWXK+Hrij9kI9KaTZKksdaFK9wWnF2rcRoyzvDDEjktnZ0Hk5ZDww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751646821910175.76269208393342; Fri, 4 Jul 2025 09:33:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXjFJ-0003aM-2O; Fri, 04 Jul 2025 12:26:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXjF0-00020M-9C for qemu-devel@nongnu.org; Fri, 04 Jul 2025 12:26:23 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uXjEx-0006oN-FZ for qemu-devel@nongnu.org; Fri, 04 Jul 2025 12:26:21 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3a6cd1a6fecso1019502f8f.3 for ; Fri, 04 Jul 2025 09:26:18 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b471b96534sm2816857f8f.48.2025.07.04.09.26.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jul 2025 09:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1751646378; x=1752251178; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YPrXkwC0VL9BF9YYIho8TZ/yyhMUTGAPJG9+vyynk9Y=; b=Nt8Mih9Sdzb9Kvs41TOWVrPn8vbHqoVkmspymlhac3JyCrth7HAAF5oiG0vHGlll8c svy6gBRnjbWCc0PYd4QIKHNsbQnbJRX2amlHmOpQHEa2EjtpUH4XIkLL/sSJq+Dh2E0L oB22Cwn7UEGY7zoPUIXWmoCqHrfBs47ZiqWrLpXlbw7rdM44CGCPUZzGeu9QbBPg52cB DrmiHEmUlMm4QH5xmhKxM+D3lYLu3SGYZyylNg4uw9Y9o7tcsL6wSMG58tMnPFrIxKV0 MsDAM+f9Y1jRlCeVNHrJCs1zsr7yzwZHUcIVb12f6tbo00TCq5TEPfU62LbGE+sQ0CCK DxOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751646378; x=1752251178; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YPrXkwC0VL9BF9YYIho8TZ/yyhMUTGAPJG9+vyynk9Y=; b=JZ50bCcDenfMDVfOfvNDHIwipsD/fijNp+uwenCglH2/A2bG/aMZZCyGrdjrBohazz UE81DTv/CpTi2yZUruxUxm00fxE9YJ7RtCeTPSCZBXtKU6+8RmxdWSCf9v3W7gpcIfr6 xsGV74vspPe6qpJUf9IUvps3N/YP0UNV2KzpsGkhM3U6zBxY2I8cYmDAu11aiSQzpub+ OcHtKlGZcLd4O/z3h6GQPcAAXgzC9XcQuRw1JtZHTldtXN4fX4uUhBX9BoJwXs5XUaQC IFLpG01khIhT8tQnmpDxBhRhIKwKzJriOSRkzhfFpp6aT5LoO5j487RPQ/kzO+9LGpom q0Aw== X-Gm-Message-State: AOJu0YwjlWaA/nsg7izozeyvF83lIxrEb0+/Bl9AGwuOmwNkC+/Z+jVf XE+Md8SAlQR4tOO4a5MK7/9bmHGYZgi8NahR6jETEYd/VrHxq/NDic0xg30VvvBxzfEv2ks6MsK Wp7hz X-Gm-Gg: ASbGncuO8IBcrLAKQ4qf9m0xOVAqmzHy+SSbg3Qtl8l81PslcUVsC+B5UEE8a0fmbEh 5TXR6ngnh9W73bHYUft9V8d6duHdx6Jsp174uTs8YL+++DPEvODJoYYgrbNMm6hN3GuTYCFtfZa BsQpTHVJtCfGrK9Xzn8fB0WxzP9SG1IJxzTuvNa5iclvlYbcq4iPhpxra4rE0kJHLWn7YZcbQxP QNYMRPVKebRBqZLyhSmKkE4RDppHmVVQZbOt3YvBnga6v0Hz0b9mu+jWUPneIMpVWBNtK5aOVii qxA+pNBl3RhOa6S3cXuawFmx95RJYeOEWpvBNK4NHQxIdC1LJA+ZgARhGEoz5sH8zoKp X-Google-Smtp-Source: AGHT+IEyvxFza/kNsHtQ1LLlKiNWZtfr0x6JrX0qJ6776qiVet/cR5nHw0hKa9DLEpSliSIiEVbn0g== X-Received: by 2002:a5d:400e:0:b0:3a5:2599:4163 with SMTP id ffacd0b85a97d-3b496604cdcmr2563886f8f.47.1751646377934; Fri, 04 Jul 2025 09:26:17 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 078/119] target/arm: Implement SME2 FCLAMP, SCLAMP, UCLAMP Date: Fri, 4 Jul 2025 17:24:18 +0100 Message-ID: <20250704162501.249138-79-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704162501.249138-1-peter.maydell@linaro.org> References: <20250704162501.249138-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1751646823960116600 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20250704142112.1018902-67-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/helper-sme.h | 15 +++++++ target/arm/tcg/sme.decode | 17 ++++++++ target/arm/tcg/sme_helper.c | 56 +++++++++++++++++++++++++ target/arm/tcg/translate-sme.c | 75 ++++++++++++++++++++++++++++++++++ 4 files changed, 163 insertions(+) diff --git a/target/arm/tcg/helper-sme.h b/target/arm/tcg/helper-sme.h index 06b95da3c38..78ba3d1f20b 100644 --- a/target/arm/tcg/helper-sme.h +++ b/target/arm/tcg/helper-sme.h @@ -298,3 +298,18 @@ DEF_HELPER_FLAGS_3(sme2_sqrshrun_sb, TCG_CALL_NO_RWG, = void, ptr, ptr, i32) DEF_HELPER_FLAGS_3(sme2_sqrshrn_dh, TCG_CALL_NO_RWG, void, ptr, ptr, i32) DEF_HELPER_FLAGS_3(sme2_uqrshrn_dh, TCG_CALL_NO_RWG, void, ptr, ptr, i32) DEF_HELPER_FLAGS_3(sme2_sqrshrun_dh, TCG_CALL_NO_RWG, void, ptr, ptr, i32) + +DEF_HELPER_FLAGS_4(sme2_sclamp_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i3= 2) +DEF_HELPER_FLAGS_4(sme2_sclamp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i3= 2) +DEF_HELPER_FLAGS_4(sme2_sclamp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i3= 2) +DEF_HELPER_FLAGS_4(sme2_sclamp_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i3= 2) + +DEF_HELPER_FLAGS_4(sme2_uclamp_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i3= 2) +DEF_HELPER_FLAGS_4(sme2_uclamp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i3= 2) +DEF_HELPER_FLAGS_4(sme2_uclamp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i3= 2) +DEF_HELPER_FLAGS_4(sme2_uclamp_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i3= 2) + +DEF_HELPER_FLAGS_5(sme2_fclamp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fp= st, i32) +DEF_HELPER_FLAGS_5(sme2_fclamp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fp= st, i32) +DEF_HELPER_FLAGS_5(sme2_fclamp_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fp= st, i32) +DEF_HELPER_FLAGS_5(sme2_bfclamp, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fps= t, i32) diff --git a/target/arm/tcg/sme.decode b/target/arm/tcg/sme.decode index c1f73d9f631..47adcb5a154 100644 --- a/target/arm/tcg/sme.decode +++ b/target/arm/tcg/sme.decode @@ -860,3 +860,20 @@ UZP_2 11000001 esz:2 1 zm:5 110100 zn:5 ....= 1 \ &zzz_e zd=3D%zd_ax2 UZP_2 11000001 00 1 zm:5 110101 zn:5 .... 1 \ &zzz_e zd=3D%zd_ax2 esz=3D4 + +&zzz_en zd zn zm esz n + +FCLAMP 11000001 esz:2 1 zm:5 110000 zn:5 .... 0 \ + &zzz_en zd=3D%zd_ax2 n=3D2 +FCLAMP 11000001 esz:2 1 zm:5 110010 zn:5 ...0 0 \ + &zzz_en zd=3D%zd_ax4 n=3D4 + +SCLAMP 11000001 esz:2 1 zm:5 110001 zn:5 .... 0 \ + &zzz_en zd=3D%zd_ax2 n=3D2 +SCLAMP 11000001 esz:2 1 zm:5 110011 zn:5 ...0 0 \ + &zzz_en zd=3D%zd_ax4 n=3D4 + +UCLAMP 11000001 esz:2 1 zm:5 110001 zn:5 .... 1 \ + &zzz_en zd=3D%zd_ax2 n=3D2 +UCLAMP 11000001 esz:2 1 zm:5 110011 zn:5 ...0 1 \ + &zzz_en zd=3D%zd_ax4 n=3D4 diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c index cf0e655bdd8..8a1f9fbf3df 100644 --- a/target/arm/tcg/sme_helper.c +++ b/target/arm/tcg/sme_helper.c @@ -2062,3 +2062,59 @@ UZP4(sme2_uzp4_d, uint64_t, ) UZP4(sme2_uzp4_q, Int128, ) =20 #undef UZP4 + +#define ICLAMP(NAME, TYPE, H) \ +void HELPER(NAME)(void *vd, void *vn, void *vm, uint32_t desc) \ +{ \ + size_t stride =3D sizeof(ARMVectorReg) / sizeof(TYPE); \ + size_t elements =3D simd_oprsz(desc) / sizeof(TYPE); \ + size_t nreg =3D simd_data(desc); \ + TYPE *d =3D vd, *n =3D vn, *m =3D vm; \ + for (size_t e =3D 0; e < elements; e++) { \ + TYPE nn =3D n[H(e)], mm =3D m[H(e)]; \ + for (size_t r =3D 0; r < nreg; r++) { \ + TYPE *dd =3D &d[r * stride + H(e)]; \ + *dd =3D MIN(MAX(*dd, nn), mm); \ + } \ + } \ +} + +ICLAMP(sme2_sclamp_b, int8_t, H1) +ICLAMP(sme2_sclamp_h, int16_t, H2) +ICLAMP(sme2_sclamp_s, int32_t, H4) +ICLAMP(sme2_sclamp_d, int64_t, H8) + +ICLAMP(sme2_uclamp_b, uint8_t, H1) +ICLAMP(sme2_uclamp_h, uint16_t, H2) +ICLAMP(sme2_uclamp_s, uint32_t, H4) +ICLAMP(sme2_uclamp_d, uint64_t, H8) + +#undef ICLAMP + +/* + * Note the argument ordering to minnum and maxnum must match + * the ARM pseudocode so that NaNs are propagated properly. + */ +#define FCLAMP(NAME, TYPE, H) \ +void HELPER(NAME)(void *vd, void *vn, void *vm, \ + float_status *fpst, uint32_t desc) \ +{ \ + size_t stride =3D sizeof(ARMVectorReg) / sizeof(TYPE); \ + size_t elements =3D simd_oprsz(desc) / sizeof(TYPE); \ + size_t nreg =3D simd_data(desc); \ + TYPE *d =3D vd, *n =3D vn, *m =3D vm; \ + for (size_t e =3D 0; e < elements; e++) { \ + TYPE nn =3D n[H(e)], mm =3D m[H(e)]; \ + for (size_t r =3D 0; r < nreg; r++) { \ + TYPE *dd =3D &d[r * stride + H(e)]; \ + *dd =3D TYPE##_minnum(TYPE##_maxnum(nn, *dd, fpst), mm, fpst);= \ + } \ + } \ +} + +FCLAMP(sme2_fclamp_h, float16, H2) +FCLAMP(sme2_fclamp_s, float32, H4) +FCLAMP(sme2_fclamp_d, float64, H8) +FCLAMP(sme2_bfclamp, bfloat16, H2) + +#undef FCLAMP diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c index d52ccf2ac55..99e4056316a 100644 --- a/target/arm/tcg/translate-sme.c +++ b/target/arm/tcg/translate-sme.c @@ -1547,3 +1547,78 @@ static gen_helper_gvec_3 * const uzp2_fns[] =3D { gen_helper_sme2_uzp2_q, }; TRANS_FEAT(UZP_2, aa64_sme2, do_zipuzp_2, a, uzp2_fns) + +static bool trans_FCLAMP(DisasContext *s, arg_zzz_en *a) +{ + static gen_helper_gvec_3_ptr * const fn[] =3D { + gen_helper_sme2_bfclamp, + gen_helper_sme2_fclamp_h, + gen_helper_sme2_fclamp_s, + gen_helper_sme2_fclamp_d, + }; + TCGv_ptr fpst; + int vl; + + if (!dc_isar_feature(aa64_sme2, s)) { + return false; + } + /* This insn uses MO_8 to encode BFloat16. */ + if (a->esz =3D=3D MO_8 && !dc_isar_feature(aa64_sme_b16b16, s)) { + return false; + } + if (!sme_sm_enabled_check(s)) { + return true; + } + + fpst =3D fpstatus_ptr(a->esz =3D=3D MO_16 ? FPST_A64_F16 : FPST_A64); + vl =3D vec_full_reg_size(s); + + tcg_gen_gvec_3_ptr(vec_full_reg_offset(s, a->zd), + vec_full_reg_offset(s, a->zn), + vec_full_reg_offset(s, a->zm), + fpst, vl, vl, a->n, fn[a->esz]); + return true; +} + +static bool do_clamp(DisasContext *s, arg_zzz_en *a, + gen_helper_gvec_3 * const fn[4]) +{ + int vl; + + if (!dc_isar_feature(aa64_sme2, s)) { + return false; + } + if (!sme_sm_enabled_check(s)) { + return true; + } + + /* + * Clamp is just a min+max, easily supported by most host + * vector operations -- we already have such an expansion in + * translate-sve.c for a single output. + * TODO: Add support in gvec for multiple simultaneous output, + * and/or copy to temporary upon overlap. + */ + vl =3D vec_full_reg_size(s); + tcg_gen_gvec_3_ool(vec_full_reg_offset(s, a->zd), + vec_full_reg_offset(s, a->zn), + vec_full_reg_offset(s, a->zm), + vl, vl, a->n, fn[a->esz]); + return true; +} + +static gen_helper_gvec_3 * const sclamp_fns[] =3D { + gen_helper_sme2_sclamp_b, + gen_helper_sme2_sclamp_h, + gen_helper_sme2_sclamp_s, + gen_helper_sme2_sclamp_d, +}; +TRANS(SCLAMP, do_clamp, a, sclamp_fns) + +static gen_helper_gvec_3 * const uclamp_fns[] =3D { + gen_helper_sme2_uclamp_b, + gen_helper_sme2_uclamp_h, + gen_helper_sme2_uclamp_s, + gen_helper_sme2_uclamp_d, +}; +TRANS(UCLAMP, do_clamp, a, uclamp_fns) --=20 2.43.0