From patchwork Fri Feb 23 15:36:22 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: 129409 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp754264lja; Fri, 23 Feb 2018 07:51:08 -0800 (PST) X-Google-Smtp-Source: AG47ELvJE9H3y0gL1RO7BSNX0hNVsuTeDgPe8nHnb/1344TvUrnCVEdEq5VWRVVrxv9gMCyxqYc6 X-Received: by 2002:a25:2749:: with SMTP id n70-v6mr1426311ybn.220.1519401068578; Fri, 23 Feb 2018 07:51:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519401068; cv=none; d=google.com; s=arc-20160816; b=ntwteUiEfaq9OWdSnTNRPLeoaQ8Vp9INKc/Z4a8LnAngkLf/a1JKZ/prmbStZ84kjM TVfHrFJmVeZpftOsN4WvJ8wii/XPeq9bOdXskGU71Zx6xgrv8HlVMV0G4PlJDrOt/vFZ MOn9LHjKYM9RorLy04+E2TJUhMeY7FbOIqGqeKyqgzfYC/jmihIaMzmLkcRr7XIwStGs xAmyOXvy44xxhsqZGXBcEiGHEdruxRX7F54kpijCs1+W8RwpYMjxkL5J5AGfPJkCdL7X K+3eYd1klMGBBIRLSathAKJV35+nBnY88T/ZwxxVR/nIodbc7vnJy1T6HtFo2i8K7dGv QehA== 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=GOuiGLXkDPfPGFB/vV/7m/UoQhAzDhiKAwdRzroXsIo=; b=uCX/YmkATkN5Uq8pN7dzzAyc2/GqgZW2s+ql5gCgauriIGb+CAT5G0y3iX8agXwnss 8hqH1KiBBndXZjtDyg2NirMWPj4cMf9KhsZdOWCHM5YQjLVMgWWfPowvXUgewbt08Chm pGGUK4IkKYDq6/LDGV7evenKAqci8GWDirQeqH0awO1jV81ksvbV5A7K/1xydEWFWO5b VxivNAYAXiTUvW0ZZNDH5r83MIygW9zYojw/9+qPSzN8VwiWZzOG7lpE3/LrFdrCZ0Is WMkw7QWlzW7h9G1im0dju2vO3/VhQJlFF1+2Dgs862kRM62cQAKQGQPCCrAFq/O0zDEI 12zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fhwSh181; 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 127-v6si455834yby.80.2018.02.23.07.51.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 23 Feb 2018 07:51:08 -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=fhwSh181; 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]:45321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epFcp-0006jd-PC for patch@linaro.org; Fri, 23 Feb 2018 10:51:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epFP6-0002x5-4Y for qemu-devel@nongnu.org; Fri, 23 Feb 2018 10:36:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epFP4-0007UD-RW for qemu-devel@nongnu.org; Fri, 23 Feb 2018 10:36:56 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:39190) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1epFP4-0007RD-Hq for qemu-devel@nongnu.org; Fri, 23 Feb 2018 10:36:54 -0500 Received: by mail-wm0-x241.google.com with SMTP id 191so5339413wmm.4 for ; Fri, 23 Feb 2018 07:36:54 -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=GOuiGLXkDPfPGFB/vV/7m/UoQhAzDhiKAwdRzroXsIo=; b=fhwSh181OWDzIWhGRDS8uex+uP8P2M2Co8k4rNi/JLzqmtSi2MzG/oKJ5mAZ1kGmZb i3cTeUzoKX6stAPTC2e9PbZHpKY5Ngz9ab0BFiQrZP3CYbLSWa8wKKSDCT8el6CCs3r0 2GjgHobFcNHYQ8SD1ErvZBZ8yOGOpReMzxGLQ= 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=GOuiGLXkDPfPGFB/vV/7m/UoQhAzDhiKAwdRzroXsIo=; b=LMgJfcfeQG4a+AYLMUePVUAczj4hbJsoSjfLZKw8AKLzFp4ptrAdCXmWD3/kOnFKbV L/5hA5C4HaCO4bjoekg0+RFBWLOl0DlHYcvkU7I8y+hq4qLNfxt5eXCxPcNLfuKGDmPD 4Ra5FpdvSQMus6+Ue1EnHRSCLo5MwsqYb8AuupsLvCXRr9+t1w0wY3xsxl8kYq8ZzIQF 60wET0SpkjSD+uedIPy8JcyyXon9b8ZiG6Q9EiYnwBKrxmlMeph05hMBIkFF0c7EpO6t P7nk8NAwWd+WqtWpuj/iL/N2H/3FFsuoevlZAtMNEDS5KcB2ei9rlJ8Q/J41bW32JoRr IUQg== X-Gm-Message-State: APf1xPDy85xrWWlC1IRwvKaLvk3eEV4JUw8OxVpj8ebX4uuhlrLYJq16 mBF3w1OSiafC58+GWCc4qwLd7w== X-Received: by 10.28.158.197 with SMTP id h188mr2194718wme.72.1519400213409; Fri, 23 Feb 2018 07:36:53 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c56sm4608499wrc.82.2018.02.23.07.36.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Feb 2018 07:36:46 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C9B6C3E0085; Fri, 23 Feb 2018 15:36:37 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-arm@nongnu.org Date: Fri, 23 Feb 2018 15:36:22 +0000 Message-Id: <20180223153636.29809-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180223153636.29809-1-alex.bennee@linaro.org> References: <20180223153636.29809-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:c09::241 Subject: [Qemu-devel] [PATCH v3 17/31] arm/translate-a64: add FP16 FPRINTx to simd_two_reg_misc_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: =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This adds the full range of half-precision floating point to integral instructions. Signed-off-by: Alex Bennée --- v3 - fix re-base conflicts - move comment to previous commit - don't double test is_scalar in unallocated checks --- target/arm/helper-a64.c | 22 ++++++++ target/arm/helper-a64.h | 2 + target/arm/translate-a64.c | 123 +++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 142 insertions(+), 5 deletions(-) -- 2.15.1 Reviewed-by: Richard Henderson diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index 4d5ae96d8f..4fd28fdf48 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -745,3 +745,25 @@ uint32_t HELPER(advsimd_acgt_f16)(float16 a, float16 b, void *fpstp) int compare = float16_compare(f0, f1, fpst); return ADVSIMD_CMPRES(compare == float_relation_greater); } + +/* round to integral */ +float16 HELPER(advsimd_rinth_exact)(float16 x, void *fp_status) +{ + return float16_round_to_int(x, fp_status); +} + +float16 HELPER(advsimd_rinth)(float16 x, void *fp_status) +{ + int old_flags = get_float_exception_flags(fp_status), new_flags; + float16 ret; + + ret = float16_round_to_int(x, fp_status); + + /* Suppress any inexact exceptions the conversion produced */ + if (!(old_flags & float_flag_inexact)) { + new_flags = get_float_exception_flags(fp_status); + set_float_exception_flags(new_flags & ~float_flag_inexact, fp_status); + } + + return ret; +} diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 003ffa582f..bc8d5b105b 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -75,3 +75,5 @@ DEF_HELPER_3(advsimd_maxnum2h, i32, i32, i32, ptr) DEF_HELPER_3(advsimd_minnum2h, i32, i32, i32, ptr) DEF_HELPER_3(advsimd_mulx2h, i32, i32, i32, ptr) DEF_HELPER_4(advsimd_muladd2h, i32, i32, i32, i32, ptr) +DEF_HELPER_2(advsimd_rinth_exact, f16, f16, ptr) +DEF_HELPER_2(advsimd_rinth, f16, f16, ptr) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index ea453fb6d9..6f33663c7b 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -11180,27 +11180,140 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn) */ static void disas_simd_two_reg_misc_fp16(DisasContext *s, uint32_t insn) { - int fpop, opcode, a; + int fpop, opcode, a, u; + int rn, rd; + bool is_q; + bool is_scalar; + bool only_in_vector = false; + + int pass; + TCGv_i32 tcg_rmode = NULL; + TCGv_ptr tcg_fpstatus = NULL; + bool need_rmode = false; + int rmode; if (!arm_dc_feature(s, ARM_FEATURE_V8_FP16)) { unallocated_encoding(s); return; } - if (!fp_access_check(s)) { - return; - } + rd = extract32(insn, 0, 5); + rn = extract32(insn, 5, 5); - opcode = extract32(insn, 12, 4); a = extract32(insn, 23, 1); + u = extract32(insn, 29, 1); + is_scalar = extract32(insn, 28, 1); + is_q = extract32(insn, 30, 1); + + opcode = extract32(insn, 12, 5); fpop = deposit32(opcode, 5, 1, a); + fpop = deposit32(fpop, 6, 1, u); switch (fpop) { + case 0x18: /* FRINTN */ + need_rmode = true; + only_in_vector = true; + rmode = FPROUNDING_TIEEVEN; + break; + case 0x19: /* FRINTM */ + need_rmode = true; + only_in_vector = true; + rmode = FPROUNDING_NEGINF; + break; + case 0x38: /* FRINTP */ + need_rmode = true; + only_in_vector = true; + rmode = FPROUNDING_POSINF; + break; + case 0x39: /* FRINTZ */ + need_rmode = true; + only_in_vector = true; + rmode = FPROUNDING_ZERO; + break; + case 0x58: /* FRINTA */ + need_rmode = true; + only_in_vector = true; + rmode = FPROUNDING_TIEAWAY; + break; + case 0x59: /* FRINTX */ + case 0x79: /* FRINTI */ + only_in_vector = true; + /* current rounding mode */ + break; default: fprintf(stderr, "%s: insn %#04x fpop %#2x\n", __func__, insn, fpop); g_assert_not_reached(); } + + /* Check additional constraints for the scalar encoding */ + if (is_scalar) { + if (!is_q) { + unallocated_encoding(s); + return; + } + /* FRINTxx is only in the vector form */ + if (only_in_vector) { + unallocated_encoding(s); + return; + } + } + + if (!fp_access_check(s)) { + return; + } + + if (need_rmode) { + tcg_fpstatus = get_fpstatus_ptr(true); + } + + if (need_rmode) { + tcg_rmode = tcg_const_i32(arm_rmode_to_sf(rmode)); + gen_helper_set_rmode(tcg_rmode, tcg_rmode, tcg_fpstatus); + } + + if (is_scalar) { + /* no operations yet */ + } else { + for (pass = 0; pass < (is_q ? 8 : 4); pass++) { + TCGv_i32 tcg_op = tcg_temp_new_i32(); + TCGv_i32 tcg_res = tcg_temp_new_i32(); + + read_vec_element_i32(s, tcg_op, rn, pass, MO_16); + + switch (fpop) { + case 0x18: /* FRINTN */ + case 0x19: /* FRINTM */ + case 0x38: /* FRINTP */ + case 0x39: /* FRINTZ */ + case 0x58: /* FRINTA */ + case 0x79: /* FRINTI */ + gen_helper_advsimd_rinth(tcg_res, tcg_op, tcg_fpstatus); + break; + case 0x59: /* FRINTX */ + gen_helper_advsimd_rinth_exact(tcg_res, tcg_op, tcg_fpstatus); + break; + default: + g_assert_not_reached(); + } + + write_vec_element_i32(s, tcg_res, rd, pass, MO_16); + + tcg_temp_free_i32(tcg_res); + tcg_temp_free_i32(tcg_op); + } + + clear_vec_high(s, is_q, rd); + } + + if (tcg_rmode) { + gen_helper_set_rmode(tcg_rmode, tcg_rmode, tcg_fpstatus); + tcg_temp_free_i32(tcg_rmode); + } + + if (tcg_fpstatus) { + tcg_temp_free_ptr(tcg_fpstatus); + } } /* AdvSIMD scalar x indexed element