From patchwork Fri Apr 27 19:19:16 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: 134634 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1092219lji; Fri, 27 Apr 2018 12:20:54 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqM8R5RX7HiiiNsle1IGzPUTed+ApD5XSzU8OQnOPIeuWQqFmcRyUUEMxH4igJ8AnLJkCfF X-Received: by 2002:ac8:2a19:: with SMTP id k25-v6mr2278539qtk.333.1524856854563; Fri, 27 Apr 2018 12:20:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524856854; cv=none; d=google.com; s=arc-20160816; b=VSN7sNDWqYo9BiEefAS9zUzGvLkubiCoIf0ImxHf8GCClRPCbR+2Vhmuxy+Gzh/xZs uK3iNgCo6J45dalyEtI/4hBEQgSQek0KA689Kpv3Tzj+5fX9sA5DgrjXWky++xEba+Sv nBVkuSht0CrLDRdVwS26CSkzZEmdNm4UQjENMWgmb6Hca1bCWglU1XW02Et0jtXaDbM2 cxUlIwK6C8oShlL5jQ3fKUA2B0AP57O7DtoTIzulyo7Yd0XOw/19+ak0C7mUIQn8DVnK dmBrtNo9e1wrc5dInIF00h7bij7ewxti+GxodO/00Q7ZKoEz7HPh8sLGPgoRNvGJMnQ6 pyqg== 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:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=3mcrynwcJksiI7mQliziT9tf0xGoc28Z9RoPNeAiZqY=; b=EU6I95poYa+Hvnw9xyVf5tVwqigTqFmSS/wFEyygDDlwv/jZymlOzFxeU2sB4tQr71 dlBAXFEaE32r+PPllt31txWH/A/pwK7Z96MNrhuwX7ujEPiNnZXLYT0kCZKEWLNbvB68 YK5wB/oSV7aB1clPTXTyXMygyXk6t5X6k+sEr8qbGCwJ6M9Do52c9CDGLulanHNJV/Xx G6TX8KHbqz/cxiYHNvWLILsVgdfc8YmQ+Oj6sabRa3nY/B7xN9ZVBO/5IzEQnxqWEJi7 7elYRLEBCDLcvkV6Gdi3eJwE009BhEThiYkITMyiPiWUJSfV7wLc7q5/zyP9M4uwUPoR 43Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=N3zj1HvB; 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 d16si240528qkb.67.2018.04.27.12.20.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 27 Apr 2018 12:20:54 -0700 (PDT) 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=N3zj1HvB; 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]:49628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC8vO-0002WP-2x for patch@linaro.org; Fri, 27 Apr 2018 15:20:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC8tz-0001Vl-4Z for qemu-devel@nongnu.org; Fri, 27 Apr 2018 15:19:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fC8tv-0002w9-2V for qemu-devel@nongnu.org; Fri, 27 Apr 2018 15:19:27 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:32919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fC8tu-0002v5-Nx for qemu-devel@nongnu.org; Fri, 27 Apr 2018 15:19:22 -0400 Received: by mail-wr0-x242.google.com with SMTP id o4-v6so2729276wrm.0 for ; Fri, 27 Apr 2018 12:19:22 -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:mime-version :content-transfer-encoding; bh=3mcrynwcJksiI7mQliziT9tf0xGoc28Z9RoPNeAiZqY=; b=N3zj1HvBrv/e36RVlGdWUwTJQJA72hrK1OfCKvMRLxATe8XqrPyhUBVJVvYMxBdzuX CagCbcp0unxyv71qu7qp73UOlE9h0SKca8Uky2aW5AdLdyM9+zbjN0Nr0L0V7hGmoQ5u L2EYtzVCXIqVbvtfisniXGdztLEOwHCUbN9fc= 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:mime-version :content-transfer-encoding; bh=3mcrynwcJksiI7mQliziT9tf0xGoc28Z9RoPNeAiZqY=; b=f6kglnhaHhXY5nawyY9T0ErQ+ehVuz/Vt6XL3JHe287qkNR6n3HS0u8vJsqKz8suNE +pilHhj4ZIB1B2Zj97FwgiXSEHDSeNSKLkjSZ9or2c82MIc+KfnPLlBppz1AWS97Ln5c fpDLAaaH+iN1j8t141pgBpYWaxW87LtoYDi1uyklFDlpRFmQ+MgC+BJeHW3D5Xv4XUrs u2YYlOLqJBW7RkuwId8P7Y/KRHe5US1CggGQnFjRisc/Ge/3y80URA4tox+udYR7xqyg Wt084y8Lo5sYQnrjyOWRjAmdH8LZ97DOsJNpTPWLtPiMBjj31Dr7cG4bFe36lagrjp1+ 92wA== X-Gm-Message-State: ALQs6tAFnznGMiy0+FvbcecBwhOtG+BGe4BRi0Tfz/Ch9Y4XIghNKo/q CaWAx5swUhep9pswkLzUKjNb+g== X-Received: by 2002:adf:83a2:: with SMTP id 31-v6mr2704048wre.19.1524856761557; Fri, 27 Apr 2018 12:19:21 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a10-v6sm2515457wri.10.2018.04.27.12.19.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Apr 2018 12:19:20 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 516713E03EB; Fri, 27 Apr 2018 20:19:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org Date: Fri, 27 Apr 2018 20:19:16 +0100 Message-Id: <20180427191916.26637-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 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::242 Subject: [Qemu-devel] [PATCH] arm/translate-a64: add FP16 FCMP operations 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@linaro.org, "open list:ARM" , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These where missed out from the rest of the half-precision work. Signed-off-by: Alex Bennée Cc: qemu-stable@nongnu.org --- target/arm/helper-a64.c | 10 +++++++ target/arm/helper-a64.h | 2 ++ target/arm/translate-a64.c | 60 ++++++++++++++++++++++++++++++++------ 3 files changed, 63 insertions(+), 9 deletions(-) -- 2.17.0 diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index afb25ad20c..35df07adb9 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -85,6 +85,16 @@ static inline uint32_t float_rel_to_flags(int res) return flags; } +uint64_t HELPER(vfp_cmph_a64)(float16 x, float16 y, void *fp_status) +{ + return float_rel_to_flags(float16_compare_quiet(x, y, fp_status)); +} + +uint64_t HELPER(vfp_cmpeh_a64)(float16 x, float16 y, void *fp_status) +{ + return float_rel_to_flags(float16_compare(x, y, fp_status)); +} + uint64_t HELPER(vfp_cmps_a64)(float32 x, float32 y, void *fp_status) { return float_rel_to_flags(float32_compare_quiet(x, y, fp_status)); diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index ef4ddfe9d8..5c0b9bd799 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -19,6 +19,8 @@ DEF_HELPER_FLAGS_2(udiv64, TCG_CALL_NO_RWG_SE, i64, i64, i64) DEF_HELPER_FLAGS_2(sdiv64, TCG_CALL_NO_RWG_SE, s64, s64, s64) DEF_HELPER_FLAGS_1(rbit64, TCG_CALL_NO_RWG_SE, i64, i64) +DEF_HELPER_3(vfp_cmph_a64, i64, f16, f16, ptr) +DEF_HELPER_3(vfp_cmpeh_a64, i64, f16, f16, ptr) DEF_HELPER_3(vfp_cmps_a64, i64, f32, f32, ptr) DEF_HELPER_3(vfp_cmpes_a64, i64, f32, f32, ptr) DEF_HELPER_3(vfp_cmpd_a64, i64, f64, f64, ptr) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index c91329249d..d27f4f24d5 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -4461,16 +4461,27 @@ static void disas_data_proc_reg(DisasContext *s, uint32_t insn) } } -static void handle_fp_compare(DisasContext *s, bool is_double, +static void handle_fp_compare(DisasContext *s, int type, unsigned int rn, unsigned int rm, bool cmp_with_zero, bool signal_all_nans) { - TCGv_i64 tcg_flags = tcg_temp_new_i64(); - TCGv_ptr fpst = get_fpstatus_ptr(false); + TCGv_i64 tcg_flags; + TCGv_ptr fpst; - if (is_double) { + if (type == 2 || + (type == 3 && !arm_dc_feature(s, ARM_FEATURE_V8_FP16))) { + unallocated_encoding(s); + return; + } + + tcg_flags = tcg_temp_new_i64(); + + switch (type) { + case 1: /* double */ + { TCGv_i64 tcg_vn, tcg_vm; + fpst = get_fpstatus_ptr(false); tcg_vn = read_fp_dreg(s, rn); if (cmp_with_zero) { tcg_vm = tcg_const_i64(0); @@ -4484,9 +4495,13 @@ static void handle_fp_compare(DisasContext *s, bool is_double, } tcg_temp_free_i64(tcg_vn); tcg_temp_free_i64(tcg_vm); - } else { + break; + } + case 0: /* single */ + { TCGv_i32 tcg_vn, tcg_vm; + fpst = get_fpstatus_ptr(false); tcg_vn = read_fp_sreg(s, rn); if (cmp_with_zero) { tcg_vm = tcg_const_i32(0); @@ -4500,6 +4515,33 @@ static void handle_fp_compare(DisasContext *s, bool is_double, } tcg_temp_free_i32(tcg_vn); tcg_temp_free_i32(tcg_vm); + break; + } + case 3: /* half */ + { + TCGv_i32 tcg_vn = tcg_temp_new_i32(); + TCGv_i32 tcg_vm = tcg_temp_new_i32(); + + fpst = get_fpstatus_ptr(true); + read_vec_element_i32(s, tcg_vn, rn, 0, MO_16); + + if (cmp_with_zero) { + tcg_vm = tcg_const_i32(0); + } else { + read_vec_element_i32(s, tcg_vm, rm, 0, MO_16); + } + if (signal_all_nans) { + gen_helper_vfp_cmpeh_a64(tcg_flags, tcg_vn, tcg_vm, fpst); + } else { + gen_helper_vfp_cmph_a64(tcg_flags, tcg_vn, tcg_vm, fpst); + } + tcg_temp_free_i32(tcg_vn); + tcg_temp_free_i32(tcg_vm); + break; + } + default: + g_assert_not_reached(); + break; } tcg_temp_free_ptr(fpst); @@ -4520,14 +4562,14 @@ static void disas_fp_compare(DisasContext *s, uint32_t insn) unsigned int mos, type, rm, op, rn, opc, op2r; mos = extract32(insn, 29, 3); - type = extract32(insn, 22, 2); /* 0 = single, 1 = double */ + type = extract32(insn, 22, 2); rm = extract32(insn, 16, 5); op = extract32(insn, 14, 2); rn = extract32(insn, 5, 5); opc = extract32(insn, 3, 2); op2r = extract32(insn, 0, 3); - if (mos || op || op2r || type > 1) { + if (mos || op || op2r) { unallocated_encoding(s); return; } @@ -4552,14 +4594,14 @@ static void disas_fp_ccomp(DisasContext *s, uint32_t insn) TCGLabel *label_continue = NULL; mos = extract32(insn, 29, 3); - type = extract32(insn, 22, 2); /* 0 = single, 1 = double */ + type = extract32(insn, 22, 2); rm = extract32(insn, 16, 5); cond = extract32(insn, 12, 4); rn = extract32(insn, 5, 5); op = extract32(insn, 4, 1); nzcv = extract32(insn, 0, 4); - if (mos || type > 1) { + if (mos) { unallocated_encoding(s); return; }