From patchwork Thu Feb 8 17:31:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 127690 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1710005ljc; Thu, 8 Feb 2018 09:39:56 -0800 (PST) X-Google-Smtp-Source: AH8x225f02LA7vU/FADm9bklBXIo1yz2/IX1GTBYeZbAtZzIBFhY9hr9YFg/9gVsvXzl2MnrAExn X-Received: by 10.13.204.69 with SMTP id o66mr1123603ywd.182.1518111595918; Thu, 08 Feb 2018 09:39:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518111595; cv=none; d=google.com; s=arc-20160816; b=wjk6S5Ic2wbPg4lR7pg0xpN5QWABJHeQNB1XQpOVQXZ4Beuiwl+4+KTrqmAiZhcnh7 Lg4kPL+7/vLMcRkXG2RT5J5Nlq2wIo65wMuxHkVLGZJ0Qu4mlLEfJhiiE+Hfibi1EnlD DFngo7wgGvPPyT3MFHOtlxc3LSaQtvt7i0YyEP8obWw+AcoezHCOnO5h2mBlq/99nFT5 nTIbcXtQ4f/ITPB9jngSew/35VgigE/YwSCO5YRsxL7+vO3ZtHJf3bQB3cZ5GCJXI5un h5SCmRa3kazErNqhV8H312Cq7FC8KCBymOcmqSQKJMQU8Jgbw9td/P4RKlGmoPon+CnM BTRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=GqS5bsgwt3K5AMcy185N2DbqVb+H8DCD8qxb5Y7klU8=; b=wMJp0NQJNO9n3a7qqRXKMJyr6uHRYjG3lMDkxV7jTbtGN7ixiGVz+DO7pTgWU0S5D3 0j5+IcY+rlOhsu3DIGur/fdWNUoKc2aQ7LCTgct7Rk0X+m+AGgMq9tJa+2bB6xQrMxeq wQUsV6EXnQuDCn8CEdttHctpjr/yLRe0JYyFW1H33HNZ6xwu84h/V2Dwosj5sVA4VCuQ oPVkDPi69Ja5sGBDsfCttxd5EB174NsgmDMiDFQSFTGVQbCYPpk74miAj9cO3+gywfS8 2H1JqTe1DaAQ2QjH78HlLh5Abz0iD++RXyAq9dNwol9qs2NPNBG2dfkwbF7rOTaLcjOz 5WYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dNtF5+Px; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i184si77554ywf.356.2018.02.08.09.39.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 08 Feb 2018 09:39:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dNtF5+Px; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejqAt-0000rd-8j for patch@linaro.org; Thu, 08 Feb 2018 12:39:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejq3M-0003JV-NW for qemu-devel@nongnu.org; Thu, 08 Feb 2018 12:32:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejq3L-0006Yc-47 for qemu-devel@nongnu.org; Thu, 08 Feb 2018 12:32:08 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:35577) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ejq3K-0006Wq-Ql for qemu-devel@nongnu.org; Thu, 08 Feb 2018 12:32:07 -0500 Received: by mail-wr0-x241.google.com with SMTP id w50so5572950wrc.2 for ; Thu, 08 Feb 2018 09:32:06 -0800 (PST) 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=GqS5bsgwt3K5AMcy185N2DbqVb+H8DCD8qxb5Y7klU8=; b=dNtF5+PxeyB7lzMaR9iUXgwIxz0DzTttGVRxeabnSoSsWYNdTfYexACRv8SW58xufZ j0Econ0oAV6AE95Dwm6s5fkNZ1Jb3HYjQApLk9jCe+EAHydK+raJegxKP3FPGWAiX9So To/yHPKp326GptWYpUEkc+A52M9+lUbnn+SoE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GqS5bsgwt3K5AMcy185N2DbqVb+H8DCD8qxb5Y7klU8=; b=fj8hZJ9K37qeizxqYnSZnN+pqK++NWUbNhqrYyCCKAUpmGvWqsbPRL4VCCv1fti6Ny 0K5UFT2xH9qxraW83fOtBZaJgQotZrClWhVoS1w1ujI2Q4MdXVi0MCZw+Z54HKhv8oXr fUtREDF860nBgoVumZ42BTlbZmHQ4yPjv21/p5wym9wZHoTZzweLqGfXkn3IBEHTh35v L8WYmyaa7rVUPe67QBLtZ/0YUNl2SRJwkJMKQvjmjLJrMXwsMyrsvrxEN93h+AyeNGya FDuzUUlsIi+PUCuo6kIklURyMIAd6V4anLGQ3LwNfuyDsPCSJE+abhotvSKhqIb+lNMz HDJQ== X-Gm-Message-State: APf1xPB36MCLKF/pGIzhy9KP5em3Jq4M7eCFgkEP+tDxZ8aaIdoo6kxt jCClEcoTIdJ+RS8X672HkHRIMg== X-Received: by 10.223.185.123 with SMTP id b56mr1471586wrg.13.1518111125751; Thu, 08 Feb 2018 09:32:05 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x190sm455675wme.27.2018.02.08.09.32.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 09:32:05 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8D23B3E0C74; Thu, 8 Feb 2018 17:31:58 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-arm@nongnu.org Date: Thu, 8 Feb 2018 17:31:36 +0000 Message-Id: <20180208173157.24705-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180208173157.24705-1-alex.bennee@linaro.org> References: <20180208173157.24705-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH v2 11/32] arm/translate-a64: add FP16 F[A]C[EQ/GE/GT] to simd_three_reg_same_fp16 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- target/arm/helper-a64.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ target/arm/helper-a64.h | 5 +++++ target/arm/translate-a64.c | 15 ++++++++++++++ 3 files changed, 69 insertions(+) -- 2.15.1 Reviewed-by: Richard Henderson diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index 25e45121af..78eeda31d1 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -599,3 +599,52 @@ ADVSIMD_HALFOP(min) ADVSIMD_HALFOP(max) ADVSIMD_HALFOP(minnum) ADVSIMD_HALFOP(maxnum) + +/* + * Floating point comparisons produce an integer result. Softfloat + * routines return float_relation types which we convert to the 0/-1 + * Neon requires. + */ + +#define ADVSIMD_CMPRES(test) (test) ? 0xffff : 0 + +uint32_t HELPER(advsimd_ceq_f16)(float16 a, float16 b, void *fpstp) +{ + float_status *fpst = fpstp; + int compare = float16_compare_quiet(a, b, fpst); + return ADVSIMD_CMPRES(compare == float_relation_equal); +} + +uint32_t HELPER(advsimd_cge_f16)(float16 a, float16 b, void *fpstp) +{ + float_status *fpst = fpstp; + int compare = float16_compare(a, b, fpst); + return ADVSIMD_CMPRES(compare == float_relation_greater || + compare == float_relation_equal); +} + +uint32_t HELPER(advsimd_cgt_f16)(float16 a, float16 b, void *fpstp) +{ + float_status *fpst = fpstp; + int compare = float16_compare(a, b, fpst); + return ADVSIMD_CMPRES(compare == float_relation_greater); +} + +uint32_t HELPER(advsimd_acge_f16)(float16 a, float16 b, void *fpstp) +{ + float_status *fpst = fpstp; + float16 f0 = float16_abs(a); + float16 f1 = float16_abs(b); + int compare = float16_compare(f0, f1, fpst); + return ADVSIMD_CMPRES(compare == float_relation_greater || + compare == float_relation_equal); +} + +uint32_t HELPER(advsimd_acgt_f16)(float16 a, float16 b, void *fpstp) +{ + float_status *fpst = fpstp; + float16 f0 = float16_abs(a); + float16 f1 = float16_abs(b); + int compare = float16_compare(f0, f1, fpst); + return ADVSIMD_CMPRES(compare == float_relation_greater); +} diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 5cbabcc27a..e701644ae7 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -57,3 +57,8 @@ DEF_HELPER_3(advsimd_maxh, f16, f16, f16, ptr) DEF_HELPER_3(advsimd_minh, f16, f16, f16, ptr) DEF_HELPER_3(advsimd_maxnumh, f16, f16, f16, ptr) DEF_HELPER_3(advsimd_minnumh, f16, f16, f16, ptr) +DEF_HELPER_3(advsimd_ceq_f16, i32, f16, f16, ptr) +DEF_HELPER_3(advsimd_cge_f16, i32, f16, f16, ptr) +DEF_HELPER_3(advsimd_cgt_f16, i32, f16, f16, ptr) +DEF_HELPER_3(advsimd_acge_f16, i32, f16, f16, ptr) +DEF_HELPER_3(advsimd_acgt_f16, i32, f16, f16, ptr) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 93d71d8b2c..14572f26e1 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -9855,6 +9855,9 @@ static void disas_simd_three_reg_same_fp16(DisasContext *s, uint32_t insn) case 0x2: /* FADD */ gen_helper_advsimd_addh(tcg_res, tcg_op1, tcg_op2, fpst); break; + case 0x4: /* FCMEQ */ + gen_helper_advsimd_ceq_f16(tcg_res, tcg_op1, tcg_op2, fpst); + break; case 0x6: /* FMAX */ gen_helper_advsimd_maxh(tcg_res, tcg_op1, tcg_op2, fpst); break; @@ -9870,6 +9873,12 @@ static void disas_simd_three_reg_same_fp16(DisasContext *s, uint32_t insn) case 0x13: /* FMUL */ gen_helper_advsimd_mulh(tcg_res, tcg_op1, tcg_op2, fpst); break; + case 0x14: /* FCMGE */ + gen_helper_advsimd_cge_f16(tcg_res, tcg_op1, tcg_op2, fpst); + break; + case 0x15: /* FACGE */ + gen_helper_advsimd_acge_f16(tcg_res, tcg_op1, tcg_op2, fpst); + break; case 0x17: /* FDIV */ gen_helper_advsimd_divh(tcg_res, tcg_op1, tcg_op2, fpst); break; @@ -9877,6 +9886,12 @@ static void disas_simd_three_reg_same_fp16(DisasContext *s, uint32_t insn) gen_helper_advsimd_subh(tcg_res, tcg_op1, tcg_op2, fpst); gen_helper_advsimd_absh(tcg_res, tcg_res); break; + case 0x1c: /* FCMGT */ + gen_helper_advsimd_cgt_f16(tcg_res, tcg_op1, tcg_op2, fpst); + break; + case 0x1d: /* FACGT */ + gen_helper_advsimd_acgt_f16(tcg_res, tcg_op1, tcg_op2, fpst); + break; default: fprintf(stderr, "%s: insn %#04x, fpop %#2x @ %#" PRIx64 "\n", __func__, insn, fpopcode, s->pc);