From patchwork Wed Apr 25 01:22:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 134205 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp251083lji; Tue, 24 Apr 2018 18:25:24 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrqWugDN6sHqegOqy0DryNhXsACAjC2N+SGKF8LmOHKPWFbwTAomFD9K1UA2IWzc5LJ2q1v X-Received: by 10.12.249.77 with SMTP id i13mr4880547qvo.93.1524619524582; Tue, 24 Apr 2018 18:25:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524619524; cv=none; d=google.com; s=arc-20160816; b=f9EPK8UoaxrdP8ncbHtAEiNT+Qum4+Kim9+he191ruRo2Z+Q3f7YXU8wjQ2gjoiyIt maWV8z3HuoQmFl07vdLAWvwCWXuA4p4IY3d0DmA3m0DKpb8OcdrKZYU5a/lRTAbOu1fM r6S7tRZEJGtodpCSRb5r2XCAsDEO6t8CnBRsXswa/smjEp68ySn6h6NT8ivSC9TIuc83 sdkZ1avh4QIqJUmr32/TagiSW7lM2yjTpjOXptoB4wIxuwz1RKWRnlNI+3fYaQr4rGK7 fMZE3kCSUcvYXIiATlUgSYI/j9qY+AvFQ+EaVFGy4yl6SJXKx3pWAS6wAiZ/RLS+CNwZ Z/gQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=OQzui9EuCc9nQfaD/b7sJPE8M560QcmRDcjPpX30vuA=; b=W3zwP5kNmSjanPSc3DB9XA4Zin9s2BppAI4PL1AxHI0566s3JB5IE6zzr+rkYS6/Bo 7D/SHaKxhTsJN2KaNZrX/H1O2+eNuulrvdxS6bMR2kE0r7fOu9zkkfArT3Fvis64GMBc n3GfPzcU7pxVgCdmOhsUSLLQJDwH5tonIaMdzvNgUjzpguNMiFpphwAjg+By3yIvOf+z +t2w0Gz6d3g7Vcb5qK9/b2uWY0+9+lrYIPW3Dv+Jd0GkiHreHUd+oIoBO5UY8CzUG0kg Hrr0sqtXjDstGtLWggE9feiN5PKLP9DVi5FpvhYTZRL/2erVynmy8hbQvNqAAARgJjDy j+DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=D/ljD++J; 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 q8si7503164qkj.267.2018.04.24.18.25.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Apr 2018 18:25:24 -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=D/ljD++J; 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]:33305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB9BT-0004sN-TN for patch@linaro.org; Tue, 24 Apr 2018 21:25:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB99N-0003ye-KO for qemu-devel@nongnu.org; Tue, 24 Apr 2018 21:23:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fB99M-0007CW-2l for qemu-devel@nongnu.org; Tue, 24 Apr 2018 21:23:13 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:37596) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fB99L-0007Ai-Ss for qemu-devel@nongnu.org; Tue, 24 Apr 2018 21:23:12 -0400 Received: by mail-pf0-x242.google.com with SMTP id p6so13745898pfn.4 for ; Tue, 24 Apr 2018 18:23:11 -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:in-reply-to:references; bh=OQzui9EuCc9nQfaD/b7sJPE8M560QcmRDcjPpX30vuA=; b=D/ljD++Jocv+2Cv2kxtC04HPH1FmUTP4xsWSl4R3bAA+Hr2356hh/KEU0qxlgYwzGt y5RYN6QXmPwnaEim6LIwwPBPPxzSfVt2HEpEWL6ajf+TvIN8e1voBXKicxlnc5S+ONiP hoLB4wBgxBM75hpjTTkT8F+mjXNz91uHvOtas= 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; bh=OQzui9EuCc9nQfaD/b7sJPE8M560QcmRDcjPpX30vuA=; b=AHYEU4gdHWFrZZWMNsmP3MlFf2at1I+qFv+32iz2B+anx55T9/e/xunFfi+7WTRXNO 40Zll85nMp6CX6+Iyj1PefzZzcnfW1/TlmFZ2NlZ+4gLypAMa/SUN33AVR0yoM7jx1v6 4xY/jOa5BzgP3VZLCoyEDxRm/d6597PmCs/X6sYAQwsGpMT4poGu+I2eI9C2SCLeuwOd d6Mji8LIVuS2egDN5j7Gq+6oD4UBIMaU2cdpmuIcUP0clNsKcCaUAB3Czk4QLUls8sCl LHrzvWDW/+raZ7PWbPU+9F9f8KsWmpjzxYHl3+efOA8mwkzQ+w7s9hWrDpJtFzRm+nBr Keyg== X-Gm-Message-State: ALQs6tCmqJbdMz8S7VYMcA8vq+kn5yafOypA9W7vhgxF7MzDEJfLIG0H MmZC8PxiSmidk4gdj7Ye8OW5FRlIEqM= X-Received: by 2002:a17:902:6986:: with SMTP id l6-v6mr27011947plk.209.1524619390695; Tue, 24 Apr 2018 18:23:10 -0700 (PDT) Received: from cloudburst.twiddle.net.com (cpe-76-173-164-138.hawaii.res.rr.com. [76.173.164.138]) by smtp.gmail.com with ESMTPSA id z127sm27767966pfb.72.2018.04.24.18.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Apr 2018 18:23:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 24 Apr 2018 15:22:53 -1000 Message-Id: <20180425012300.14698-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180425012300.14698-1-richard.henderson@linaro.org> References: <20180425012300.14698-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH 2/9] target/arm: Implement vector shifted FCVT 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: peter.maydell@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While we have some of the scalar paths for FCVT for fp16, we failed to decode the fp16 version of these instructions. Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 65 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 19 deletions(-) -- 2.14.3 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index c92e052686..e2d11998bd 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -7120,19 +7120,28 @@ static void handle_simd_shift_fpint_conv(DisasContext *s, bool is_scalar, bool is_q, bool is_u, int immh, int immb, int rn, int rd) { - bool is_double = extract32(immh, 3, 1); int immhb = immh << 3 | immb; - int fracbits = (is_double ? 128 : 64) - immhb; - int pass; + int pass, size, fracbits; TCGv_ptr tcg_fpstatus; TCGv_i32 tcg_rmode, tcg_shift; - if (!extract32(immh, 2, 2)) { - unallocated_encoding(s); - return; - } - - if (!is_scalar && !is_q && is_double) { + if (immh & 0x8) { + size = MO_64; + if (!is_scalar && !is_q) { + unallocated_encoding(s); + return; + } + } else if (immh & 0x4) { + size = MO_32; + } else if (immh & 0x2) { + size = MO_16; + if (!arm_dc_feature(s, ARM_FEATURE_V8_FP16)) { + unallocated_encoding(s); + return; + } + } else { + /* Should have split out AdvSIMD modified immediate earlier. */ + assert(immh == 1); unallocated_encoding(s); return; } @@ -7144,11 +7153,12 @@ static void handle_simd_shift_fpint_conv(DisasContext *s, bool is_scalar, assert(!(is_scalar && is_q)); tcg_rmode = tcg_const_i32(arm_rmode_to_sf(FPROUNDING_ZERO)); - tcg_fpstatus = get_fpstatus_ptr(false); + tcg_fpstatus = get_fpstatus_ptr(size == MO_16); gen_helper_set_rmode(tcg_rmode, tcg_rmode, tcg_fpstatus); + fracbits = (16 << size) - immhb; tcg_shift = tcg_const_i32(fracbits); - if (is_double) { + if (size == 3) { int maxpass = is_scalar ? 1 : 2; for (pass = 0; pass < maxpass; pass++) { @@ -7165,20 +7175,37 @@ static void handle_simd_shift_fpint_conv(DisasContext *s, bool is_scalar, } clear_vec_high(s, is_q, rd); } else { - int maxpass = is_scalar ? 1 : is_q ? 4 : 2; + void (*fn)(TCGv_i32, TCGv_i32, TCGv_i32, TCGv_ptr); + int maxpass = is_scalar ? 1 : (8 << is_q >> size); + + switch (size) { + case MO_16: + if (is_u) { + fn = gen_helper_vfp_toulh; + } else { + fn = gen_helper_vfp_toslh; + } + break; + case MO_32: + if (is_u) { + fn = gen_helper_vfp_touls; + } else { + fn = gen_helper_vfp_tosls; + } + break; + default: + g_assert_not_reached(); + } + for (pass = 0; pass < maxpass; pass++) { TCGv_i32 tcg_op = tcg_temp_new_i32(); - read_vec_element_i32(s, tcg_op, rn, pass, MO_32); - if (is_u) { - gen_helper_vfp_touls(tcg_op, tcg_op, tcg_shift, tcg_fpstatus); - } else { - gen_helper_vfp_tosls(tcg_op, tcg_op, tcg_shift, tcg_fpstatus); - } + read_vec_element_i32(s, tcg_op, rn, pass, size); + fn(tcg_op, tcg_op, tcg_shift, tcg_fpstatus); if (is_scalar) { write_fp_sreg(s, rd, tcg_op); } else { - write_vec_element_i32(s, tcg_op, rd, pass, MO_32); + write_vec_element_i32(s, tcg_op, rd, pass, size); } tcg_temp_free_i32(tcg_op); }