From patchwork Thu Jul 29 11:15:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 488711 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp2091579jas; Thu, 29 Jul 2021 04:57:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCgTti1Ru4Uc8fHpV7dy40CvUYytWnxpcG4M8AW1VqQLpIpRD+TiQgOMfQ/SMId/BEXILZ X-Received: by 2002:a25:6148:: with SMTP id v69mr5864748ybb.510.1627559870204; Thu, 29 Jul 2021 04:57:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627559870; cv=none; d=google.com; s=arc-20160816; b=hL1PXKVQW9+ER2lg0tBsfrqICUrVHR3ZD8C3gSgWcx07SujIPVw2apYYLSimccb0yF Yfh+OvHj4MEtAm+rCwW4LlJ6WhtvU7VBNFhbkhqSd3VoTik02EbhId3jcuryZII9hVc6 4Vxvw0dNHUV1T5jkvxV7Bc/zc33+e32yPhhB83qjX76gzGeQlSS4mCV9yTk7kC3c7TNs FSx3bpvQchDllBLyQtg/umR+3YDWpwLsode48jITwOParUS/662RGvkEhM1E/YzSsiBU IpwvU+sJbPZbe6MBEj88qY5gzZnj48Aan2NguXBr/trD07cAPrnaWHjbGjCdLErLR5Ai n6aw== 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=FRwz4ys1hUqinmA7323A6Mg5frUBtFRSL5FRRL7kFdQ=; b=zJj+yhmGl1HDa0ADoM7A7Jr7xZCbSlNGn/iUD9cw0mPWLKAhSo++7Br+j66URhf7Q/ ao3GKR/P/voPbhjhCuKW1f5aBnH3VGdYgedKikmEBFjT+617iubOd8MeneBEN2LOPBgu cjYy1QuELUsUBEO+p+gqnbCzf+Xrucl/1dPRBqMW2jdTfOeuP+qRhwNAbRNIa9CxOFv9 ANM+BmQB9Un00pWEepcM4qw9G1BaNyTsBj1LecrbIrRP/hH24ElC//Z4ECxTy6P8c4Zl 2Nv3nsT9FVoMCYqGvpR2VXC9XHe64mv48aerQ37C37tdSNratdWFc2p2PlXKk29rFjO9 Ddrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M3jI9HZr; 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 x12si2400111ybj.276.2021.07.29.04.57.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Jul 2021 04:57:50 -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=M3jI9HZr; 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]:33676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m94fd-0004Df-K1 for patch@linaro.org; Thu, 29 Jul 2021 07:57:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m941X-0001LI-OR for qemu-devel@nongnu.org; Thu, 29 Jul 2021 07:16:23 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:40660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9415-0001SE-EV for qemu-devel@nongnu.org; Thu, 29 Jul 2021 07:16:23 -0400 Received: by mail-wm1-x32e.google.com with SMTP id f18-20020a05600c4e92b0290253c32620e7so6335662wmq.5 for ; Thu, 29 Jul 2021 04:15:54 -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=FRwz4ys1hUqinmA7323A6Mg5frUBtFRSL5FRRL7kFdQ=; b=M3jI9HZrGs3NANcK5PCLPkdosOySStMFkmprGPaGrpBc0bwJ8zy9qiS7H0ou0n2Gb7 cmC1Vn6c0i8+NmnWg3rT5Vy8mc/iAO0COUIYna/JBfNDUZTLBCfna/O219Vhqfpa8f28 gKKatm1T8Dednz4d626Dsa6Xxy1tSYu63z/CNsksCHaVusOtYqwCwuJaH1S0YmJSN6Ee cjdfQyYvMd5dO1zRsMqMW8Gea2pwFC/w+uKPxL2PGjDi6Ljkv6tVVzF9AC3CD9PBu4eD iwfrYAD1A0urCcV2R7kNyybgL/JgPUiWu+bPU06o+XPx/BvGrdH8WR+tAsC57TpTgaap vM7w== 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=FRwz4ys1hUqinmA7323A6Mg5frUBtFRSL5FRRL7kFdQ=; b=F3pY+IE9BSVdmpeNwCKjlEkRNuSZs4iBILrBN9dnVjA3FmViHe3ydS9aJUNd6ovdcN er4n3UXSNY534Yn+jKI27f6PonYBD9ZOOF+CSJ59gLd+CBvBYb5M+9dh89hKOOBas9oQ HYA/m5JNqEM6Uu61IJ5YPTnRA5M004wrYMb0RrUWz2kJ7QlUebqkjiQVO/kDtV9PBY68 TunKjRZo+Yi0NCwcWyDha7wP/rDGV6Ee1+mozNDXzQGivWfN2PgFZid43TvkCgSt+sne AQLcF6YTUsNMJgH3l5fWVesJ5NSRDHgUjh9wnTgut2TNpP0eYfpeU+ZONJtiewktgbvB pr6w== X-Gm-Message-State: AOAM533iKEPs0RRtBJFyKUnEqwNFkiTaBXYlbHjVh9CUyqh28z1cXaJv w9I9lopkuzUHUVnszWPBsYeBn3cley45Lg== X-Received: by 2002:a7b:cd86:: with SMTP id y6mr2061089wmj.181.1627557353233; Thu, 29 Jul 2021 04:15:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 04:15:52 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH for-6.2 46/53] target/arm: Implement MVE fp vector comparisons Date: Thu, 29 Jul 2021 12:15:05 +0100 Message-Id: <20210729111512.16541-47-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::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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 fp vector comparisons VCMP and VPT. Signed-off-by: Peter Maydell --- target/arm/helper-mve.h | 18 +++++++++++ target/arm/mve.decode | 39 +++++++++++++++++++---- target/arm/mve_helper.c | 64 ++++++++++++++++++++++++++++++++++++++ target/arm/translate-mve.c | 22 +++++++++++++ 4 files changed, 137 insertions(+), 6 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/helper-mve.h b/target/arm/helper-mve.h index 47fd18dddbf..0c15c531641 100644 --- a/target/arm/helper-mve.h +++ b/target/arm/helper-mve.h @@ -813,6 +813,24 @@ DEF_HELPER_FLAGS_3(mve_vcmple_scalarb, TCG_CALL_NO_WG, void, env, ptr, i32) DEF_HELPER_FLAGS_3(mve_vcmple_scalarh, TCG_CALL_NO_WG, void, env, ptr, i32) DEF_HELPER_FLAGS_3(mve_vcmple_scalarw, TCG_CALL_NO_WG, void, env, ptr, i32) +DEF_HELPER_FLAGS_3(mve_vfcmpeqh, TCG_CALL_NO_WG, void, env, ptr, ptr) +DEF_HELPER_FLAGS_3(mve_vfcmpeqs, TCG_CALL_NO_WG, void, env, ptr, ptr) + +DEF_HELPER_FLAGS_3(mve_vfcmpneh, TCG_CALL_NO_WG, void, env, ptr, ptr) +DEF_HELPER_FLAGS_3(mve_vfcmpnes, TCG_CALL_NO_WG, void, env, ptr, ptr) + +DEF_HELPER_FLAGS_3(mve_vfcmpgeh, TCG_CALL_NO_WG, void, env, ptr, ptr) +DEF_HELPER_FLAGS_3(mve_vfcmpges, TCG_CALL_NO_WG, void, env, ptr, ptr) + +DEF_HELPER_FLAGS_3(mve_vfcmplth, TCG_CALL_NO_WG, void, env, ptr, ptr) +DEF_HELPER_FLAGS_3(mve_vfcmplts, TCG_CALL_NO_WG, void, env, ptr, ptr) + +DEF_HELPER_FLAGS_3(mve_vfcmpgth, TCG_CALL_NO_WG, void, env, ptr, ptr) +DEF_HELPER_FLAGS_3(mve_vfcmpgts, TCG_CALL_NO_WG, void, env, ptr, ptr) + +DEF_HELPER_FLAGS_3(mve_vfcmpleh, TCG_CALL_NO_WG, void, env, ptr, ptr) +DEF_HELPER_FLAGS_3(mve_vfcmples, TCG_CALL_NO_WG, void, env, ptr, ptr) + DEF_HELPER_FLAGS_4(mve_vfadd_scalarh, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) DEF_HELPER_FLAGS_4(mve_vfadd_scalars, TCG_CALL_NO_WG, void, env, ptr, ptr, i32) diff --git a/target/arm/mve.decode b/target/arm/mve.decode index 1a18c3b8eeb..7767ecae2ac 100644 --- a/target/arm/mve.decode +++ b/target/arm/mve.decode @@ -124,6 +124,9 @@ @vcmp_scalar .... .... .. size:2 qn:3 . .... .... .... rm:4 &vcmp_scalar \ mask=%mask_22_13 +@vcmp_fp .... .... .... qn:3 . .... .... .... .... &vcmp \ + qm=%qm size=%2op_fp_scalar_size mask=%mask_22_13 + @vmaxv .... .... .... size:2 .. rda:4 .... .... .... &vmaxv qm=%qm @2op_fp .... .... .... .... .... .... .... .... &2op \ @@ -663,17 +666,41 @@ VSHLC 111 0 1110 1 . 1 imm:5 ... 0 1111 1100 rdm:4 qd=%qd # Comparisons. We expand out the conditions which are split across # encodings T1, T2, T3 and the fc bits. These include VPT, which is # effectively "VCMP then VPST". A plain "VCMP" has a mask field of zero. -VCMPEQ 1111 1110 0 . .. ... 1 ... 0 1111 0 0 . 0 ... 0 @vcmp -VCMPNE 1111 1110 0 . .. ... 1 ... 0 1111 1 0 . 0 ... 0 @vcmp +{ + VCMPEQ_fp 111 . 1110 0 . 11 ... 1 ... 0 1111 0 0 . 0 ... 0 @vcmp_fp + VCMPEQ 111 1 1110 0 . .. ... 1 ... 0 1111 0 0 . 0 ... 0 @vcmp +} + +{ + VCMPNE_fp 111 . 1110 0 . 11 ... 1 ... 0 1111 1 0 . 0 ... 0 @vcmp_fp + VCMPNE 111 1 1110 0 . .. ... 1 ... 0 1111 1 0 . 0 ... 0 @vcmp +} + +{ + VCMPGE_fp 111 . 1110 0 . 11 ... 1 ... 1 1111 0 0 . 0 ... 0 @vcmp_fp + VCMPGE 111 1 1110 0 . .. ... 1 ... 1 1111 0 0 . 0 ... 0 @vcmp +} + +{ + VCMPLT_fp 111 . 1110 0 . 11 ... 1 ... 1 1111 1 0 . 0 ... 0 @vcmp_fp + VCMPLT 111 1 1110 0 . .. ... 1 ... 1 1111 1 0 . 0 ... 0 @vcmp +} + +{ + VCMPGT_fp 111 . 1110 0 . 11 ... 1 ... 1 1111 0 0 . 0 ... 1 @vcmp_fp + VCMPGT 111 1 1110 0 . .. ... 1 ... 1 1111 0 0 . 0 ... 1 @vcmp +} + +{ + VCMPLE_fp 111 . 1110 0 . 11 ... 1 ... 1 1111 1 0 . 0 ... 1 @vcmp_fp + VCMPLE 1111 1110 0 . .. ... 1 ... 1 1111 1 0 . 0 ... 1 @vcmp +} + { VPSEL 1111 1110 0 . 11 ... 1 ... 0 1111 . 0 . 0 ... 1 @2op_nosz VCMPCS 1111 1110 0 . .. ... 1 ... 0 1111 0 0 . 0 ... 1 @vcmp VCMPHI 1111 1110 0 . .. ... 1 ... 0 1111 1 0 . 0 ... 1 @vcmp } -VCMPGE 1111 1110 0 . .. ... 1 ... 1 1111 0 0 . 0 ... 0 @vcmp -VCMPLT 1111 1110 0 . .. ... 1 ... 1 1111 1 0 . 0 ... 0 @vcmp -VCMPGT 1111 1110 0 . .. ... 1 ... 1 1111 0 0 . 0 ... 1 @vcmp -VCMPLE 1111 1110 0 . .. ... 1 ... 1 1111 1 0 . 0 ... 1 @vcmp { VPNOT 1111 1110 0 0 11 000 1 000 0 1111 0100 1101 diff --git a/target/arm/mve_helper.c b/target/arm/mve_helper.c index 6a73134c74a..ebfd5746b13 100644 --- a/target/arm/mve_helper.c +++ b/target/arm/mve_helper.c @@ -3161,3 +3161,67 @@ DO_FP_VMAXMINV(vmaxnmavh, 2, uint16_t, float16, true, float16_maxnum) DO_FP_VMAXMINV(vmaxnmavs, 4, uint32_t, float32, true, float32_maxnum) DO_FP_VMAXMINV(vminnmavh, 2, uint16_t, float16, true, float16_minnum) DO_FP_VMAXMINV(vminnmavs, 4, uint32_t, float32, true, float32_minnum) + +/* FP compares; note that all comparisons signal InvalidOp for QNaNs */ +#define DO_VCMP_FP(OP, ESIZE, TYPE, FN) \ + void HELPER(glue(mve_, OP))(CPUARMState *env, void *vn, void *vm) \ + { \ + TYPE *n = vn, *m = vm; \ + uint16_t mask = mve_element_mask(env); \ + uint16_t eci_mask = mve_eci_mask(env); \ + uint16_t beatpred = 0; \ + uint16_t emask = MAKE_64BIT_MASK(0, ESIZE); \ + unsigned e; \ + float_status *fpst; \ + float_status scratch_fpst; \ + bool r; \ + for (e = 0; e < 16 / ESIZE; e++, emask <<= ESIZE) { \ + if ((mask & emask) == 0) { \ + continue; \ + } \ + fpst = (ESIZE == 2) ? &env->vfp.standard_fp_status_f16 : \ + &env->vfp.standard_fp_status; \ + if (!(mask & (1 << (e * ESIZE)))) { \ + /* We need the result but without updating flags */ \ + scratch_fpst = *fpst; \ + fpst = &scratch_fpst; \ + } \ + r = FN(n[H##ESIZE(e)], m[H##ESIZE(e)], fpst); \ + /* Comparison sets 0/1 bits for each byte in the element */ \ + beatpred |= r * emask; \ + } \ + beatpred &= mask; \ + env->v7m.vpr = (env->v7m.vpr & ~(uint32_t)eci_mask) | \ + (beatpred & eci_mask); \ + mve_advance_vpt(env); \ + } + +/* + * Some care is needed here to get the correct result for the unordered case. + * Architecturally EQ, GE and GT are defined to be false for unordered, but + * the NE, LT and LE comparisons are defined as simple logical inverses of + * EQ, GE and GT and so they must return true for unordered. The softfloat + * comparison functions float*_{eq,le,lt} all return false for unordered. + */ +#define DO_GE16(X, Y, S) float16_le(Y, X, S) +#define DO_GE32(X, Y, S) float32_le(Y, X, S) +#define DO_GT16(X, Y, S) float16_lt(Y, X, S) +#define DO_GT32(X, Y, S) float32_lt(Y, X, S) + +DO_VCMP_FP(vfcmpeqh, 2, uint16_t, float16_eq) +DO_VCMP_FP(vfcmpeqs, 4, uint32_t, float32_eq) + +DO_VCMP_FP(vfcmpneh, 2, uint16_t, !float16_eq) +DO_VCMP_FP(vfcmpnes, 4, uint32_t, !float32_eq) + +DO_VCMP_FP(vfcmpgeh, 2, uint16_t, DO_GE16) +DO_VCMP_FP(vfcmpges, 4, uint32_t, DO_GE32) + +DO_VCMP_FP(vfcmplth, 2, uint16_t, !DO_GE16) +DO_VCMP_FP(vfcmplts, 4, uint32_t, !DO_GE32) + +DO_VCMP_FP(vfcmpgth, 2, uint16_t, DO_GT16) +DO_VCMP_FP(vfcmpgts, 4, uint32_t, DO_GT32) + +DO_VCMP_FP(vfcmpleh, 2, uint16_t, !DO_GT16) +DO_VCMP_FP(vfcmples, 4, uint32_t, !DO_GT32) diff --git a/target/arm/translate-mve.c b/target/arm/translate-mve.c index 4e2aa2cae2d..da14a6f790e 100644 --- a/target/arm/translate-mve.c +++ b/target/arm/translate-mve.c @@ -1758,6 +1758,28 @@ DO_VCMP(VCMPLT, vcmplt) DO_VCMP(VCMPGT, vcmpgt) DO_VCMP(VCMPLE, vcmple) +#define DO_VCMP_FP(INSN, FN) \ + static bool trans_##INSN(DisasContext *s, arg_vcmp *a) \ + { \ + static MVEGenCmpFn * const fns[] = { \ + NULL, \ + gen_helper_mve_##FN##h, \ + gen_helper_mve_##FN##s, \ + NULL, \ + }; \ + if (!dc_isar_feature(aa32_mve_fp, s)) { \ + return false; \ + } \ + return do_vcmp(s, a, fns[a->size]); \ + } + +DO_VCMP_FP(VCMPEQ_fp, vfcmpeq) +DO_VCMP_FP(VCMPNE_fp, vfcmpne) +DO_VCMP_FP(VCMPGE_fp, vfcmpge) +DO_VCMP_FP(VCMPLT_fp, vfcmplt) +DO_VCMP_FP(VCMPGT_fp, vfcmpgt) +DO_VCMP_FP(VCMPLE_fp, vfcmple) + static bool do_vmaxv(DisasContext *s, arg_vmaxv *a, MVEGenVADDVFn fn) { /*