From patchwork Mon Jul 23 20:17:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 142650 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp6511889ljj; Mon, 23 Jul 2018 14:25:38 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcxkeSQQg3KTzatM1MuFlxR0qaJCrXcXV16Yyh+Utvo3Y8AVWKNQ+IOnlOkberv/Ip8uZOl X-Received: by 2002:a37:d197:: with SMTP id o23-v6mr13178184qkl.210.1532381138019; Mon, 23 Jul 2018 14:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532381138; cv=none; d=google.com; s=arc-20160816; b=IuNVUTs7szsg/j5reXQ26fG1gY8GHVS3l4cop+9TYKGGQA8jdni/D6FUso350QlU1G ICIU2AjSwmf0U62PcyyOPAkglU0IA4/vQ8Aongnjwtbk2N+B0ndNViM7npMuinot/ze9 rqd2MQFwkfM91KL7cQGmRrYKv4YM6oQ2KJcdzurKegGdWiGtmGSoPo2jvKYVCgnUDbb2 jmHLcf+bZzZcX8amUThZalvstUcoST5iJsdxXOsENDoMzmqIDzjsZ5/TfXbgs6k4CqiD r01mi4ZUqIi8YR/iMN85HHp9GseoRXjuiNRQouWfSzT2Sqnb3sR6N2l48aZApemy0rth NwqA== 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=WSnvSXMbdx8hUZexpfJ0bUF04M4al43hgNTbrqASRV8=; b=KK4KbsKd/OqsWMH/bNoyQ5ERLisYZKKfNBXBa/mLyTraQZ/1p+B0aWUsnw2/x1Tjit +uTFxsTV7+bz29RJ+yH/U+FbLkPtv+l/9kSCxKdJiFkuQBmRwwVBdWC2Z6KWuhcI5f2t Z0gshYuK3Jz7wfAJ51ZvwGnEaRR514xDu1OVGeIWew/LkO4KT1hTw2R1XOMFtMqZ/HSa 2PFuJGr8LS+bxWT5iTFze0eKcl15meA1E0D0/4zlV76iUvCmrVfznxF1Or2qUks/EgJg q5EfVjt1rq6Qlm2judsk0tLOpmLXCJrDjY28K+dsiacDNv7Z7jhX9PqW4kvrDGZOL9sI qeTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=VYxrYdxc; 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=ibm.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u26-v6si2800352qkk.140.2018.07.23.14.25.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 23 Jul 2018 14:25:38 -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=@gmail.com header.s=20161025 header.b=VYxrYdxc; 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=ibm.com Received: from localhost ([::1]:36758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhiKn-0002rE-F7 for patch@linaro.org; Mon, 23 Jul 2018 17:25:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhhKu-00047b-RG for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:21:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhhKr-0005TC-Ju for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:21:40 -0400 Received: from mail-oi0-x22a.google.com ([2607:f8b0:4003:c06::22a]:39357) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhhKr-0005T5-CU; Mon, 23 Jul 2018 16:21:37 -0400 Received: by mail-oi0-x22a.google.com with SMTP id d189-v6so3488686oib.6; Mon, 23 Jul 2018 13:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WSnvSXMbdx8hUZexpfJ0bUF04M4al43hgNTbrqASRV8=; b=VYxrYdxcDH8autSpHW9z16WRoqXBlNx5b+Bs+WTqIM8u+yS+0A/J2yuOnYnqrdnna4 Iy7hJA3G8kdyDS5vqNxK/C/NJNZML7C6SCAY/ySvPl6M5MuEzq5E2wY5okpWmdjiH2vq XGTipl6TR1KhhS+KUbw/h0xfQFacFSGWjdG2lQkFkL2O/71uGiUIyIDXbkqWBEuIBgDL rczF/rYis3ARkkAR1qxHHQbH1qd05CksJNcZqDB3jSchhoXZvDyrnKAcVHzmVODDFt6h 6Q1GBtzHiOQ93eW2iqvhWVqLNSJuiWWqxGnKNwc8LElNImlOGauPXe4vvIkQLlr0svBW 8c6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WSnvSXMbdx8hUZexpfJ0bUF04M4al43hgNTbrqASRV8=; b=fsDHONyEvAljOf8EbYsGijKPYtV4t3qxTMrYuYc4mRiMnHISdmfOB49/RHDWNK0gVs 7Rq9HEHdKPvmVE/S0dU2zspGct0s1z8rCAvCvJOBMWdAe+S8xHPILUBeMu4GRtNRZ3VT f7lxPOUywWEPMk8Q8kU/HBm4ui08UDTXMATW5G8DBomZKQ+mn3toau8cwUiXYXiM2JmT CynBzfi/Eqcw0s0JgJD33wX2MtWLcAeIo5vF17M3yXNZMeHf3Fafpt+U5tOiSMCEDf5k GMOKKMCbVFKN3uwCNeYPZbWy05g7xibGbeCbh89GwjQ2KG1+sWls4a1X8cVHzkgTP8Vz D2fA== X-Gm-Message-State: AOUpUlFPPxPL7zXY7x+ke58nUuE0glaMA2qL7uLWg4OHhpo0HNW8c6vU Ahwhdm2tXxfwF4CL0EAG6gHI8vU0Gt4j2w== X-Received: by 2002:aca:6142:: with SMTP id v63-v6mr312199oib.137.1532377296139; Mon, 23 Jul 2018 13:21:36 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id v202-v6sm9033537oie.47.2018.07.23.13.21.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jul 2018 13:21:35 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 23 Jul 2018 15:17:31 -0500 Message-Id: <20180723201748.25573-83-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> References: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::22a Subject: [Qemu-devel] [PATCH 82/99] target/arm: Implement FCMP for 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-stable@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée These where missed out from the rest of the half-precision work. Cc: qemu-stable@nongnu.org Reviewed-by: Peter Maydell Signed-off-by: Alex Bennée Tested-by: Alex Bennée Signed-off-by: Richard Henderson Message-id: 20180512003217.9105-9-richard.henderson@linaro.org [rth: Diagnose lack of FP16 before fp_access_check] Signed-off-by: Richard Henderson Signed-off-by: Peter Maydell (cherry picked from commit 7a1929256ea1a03df12625e75ed571c60dca5bfb) Signed-off-by: Michael Roth --- target/arm/helper-a64.c | 10 +++++ target/arm/helper-a64.h | 2 + target/arm/translate-a64.c | 88 ++++++++++++++++++++++++++++++-------- 3 files changed, 83 insertions(+), 17 deletions(-) -- 2.17.1 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 9880a5d047..05d51ecbdc 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -4469,14 +4469,14 @@ 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 size, 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_ptr fpst = get_fpstatus_ptr(size == MO_16); - if (is_double) { + if (size == MO_64) { TCGv_i64 tcg_vn, tcg_vm; tcg_vn = read_fp_dreg(s, rn); @@ -4493,19 +4493,35 @@ static void handle_fp_compare(DisasContext *s, bool is_double, tcg_temp_free_i64(tcg_vn); tcg_temp_free_i64(tcg_vm); } else { - TCGv_i32 tcg_vn, tcg_vm; + TCGv_i32 tcg_vn = tcg_temp_new_i32(); + TCGv_i32 tcg_vm = tcg_temp_new_i32(); - tcg_vn = read_fp_sreg(s, rn); + read_vec_element_i32(s, tcg_vn, rn, 0, size); if (cmp_with_zero) { - tcg_vm = tcg_const_i32(0); + tcg_gen_movi_i32(tcg_vm, 0); } else { - tcg_vm = read_fp_sreg(s, rm); + read_vec_element_i32(s, tcg_vm, rm, 0, size); } - if (signal_all_nans) { - gen_helper_vfp_cmpes_a64(tcg_flags, tcg_vn, tcg_vm, fpst); - } else { - gen_helper_vfp_cmps_a64(tcg_flags, tcg_vn, tcg_vm, fpst); + + switch (size) { + case MO_32: + if (signal_all_nans) { + gen_helper_vfp_cmpes_a64(tcg_flags, tcg_vn, tcg_vm, fpst); + } else { + gen_helper_vfp_cmps_a64(tcg_flags, tcg_vn, tcg_vm, fpst); + } + break; + case 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); + } + break; + default: + g_assert_not_reached(); } + tcg_temp_free_i32(tcg_vn); tcg_temp_free_i32(tcg_vm); } @@ -4526,16 +4542,35 @@ static void handle_fp_compare(DisasContext *s, bool is_double, static void disas_fp_compare(DisasContext *s, uint32_t insn) { unsigned int mos, type, rm, op, rn, opc, op2r; + int size; 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; + } + + switch (type) { + case 0: + size = MO_32; + break; + case 1: + size = MO_64; + break; + case 3: + size = MO_16; + if (arm_dc_feature(s, ARM_FEATURE_V8_FP16)) { + break; + } + /* fallthru */ + default: unallocated_encoding(s); return; } @@ -4544,7 +4579,7 @@ static void disas_fp_compare(DisasContext *s, uint32_t insn) return; } - handle_fp_compare(s, type, rn, rm, opc & 1, opc & 2); + handle_fp_compare(s, size, rn, rm, opc & 1, opc & 2); } /* Floating point conditional compare @@ -4558,16 +4593,35 @@ static void disas_fp_ccomp(DisasContext *s, uint32_t insn) unsigned int mos, type, rm, cond, rn, op, nzcv; TCGv_i64 tcg_flags; TCGLabel *label_continue = NULL; + int size; 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; + } + + switch (type) { + case 0: + size = MO_32; + break; + case 1: + size = MO_64; + break; + case 3: + size = MO_16; + if (arm_dc_feature(s, ARM_FEATURE_V8_FP16)) { + break; + } + /* fallthru */ + default: unallocated_encoding(s); return; } @@ -4588,7 +4642,7 @@ static void disas_fp_ccomp(DisasContext *s, uint32_t insn) gen_set_label(label_match); } - handle_fp_compare(s, type, rn, rm, false, op); + handle_fp_compare(s, size, rn, rm, false, op); if (cond < 0x0e) { gen_set_label(label_continue);